diff --git a/erpnext/locale/main.pot b/erpnext/locale/main.pot
index 3ab257c06c4..2678d5946f0 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: 2025-03-30 09:35+0000\n"
-"PO-Revision-Date: 2025-03-30 09:35+0000\n"
+"POT-Creation-Date: 2025-04-06 09:35+0000\n"
+"PO-Revision-Date: 2025-04-06 09:35+0000\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: hello@frappe.io\n"
"MIME-Version: 1.0\n"
@@ -1110,7 +1110,7 @@ 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:2328
+#: erpnext/public/js/controllers/transaction.js:2341
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
msgid "Accepted Quantity"
@@ -1511,7 +1511,7 @@ msgstr ""
msgid "Account: {0} can only be updated via Stock Transactions"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2814
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2815
msgid "Account: {0} is not permitted under Payment Entry"
msgstr ""
@@ -3408,7 +3408,7 @@ msgstr ""
msgid "Advance amount"
msgstr ""
-#: erpnext/controllers/taxes_and_totals.py:821
+#: erpnext/controllers/taxes_and_totals.py:837
msgid "Advance amount cannot be greater than {0} {1}"
msgstr ""
@@ -3539,7 +3539,7 @@ msgid "Against Income Account"
msgstr ""
#: erpnext/accounts/doctype/journal_entry/journal_entry.py:693
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:780
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:775
msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
msgstr ""
@@ -3919,7 +3919,7 @@ msgstr ""
msgid "All items have already been transferred for this Work Order."
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:2431
+#: erpnext/public/js/controllers/transaction.js:2444
msgid "All items in this document already have a linked Quality Inspection."
msgstr ""
@@ -4160,8 +4160,8 @@ msgstr ""
#: erpnext/stock/doctype/item/item.json
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/stock_settings/stock_settings.json
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:185
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:197
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:186
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:198
msgid "Allow Negative Stock"
msgstr ""
@@ -4225,7 +4225,7 @@ msgstr ""
msgid "Allow Resetting Service Level Agreement"
msgstr ""
-#: erpnext/support/doctype/service_level_agreement/service_level_agreement.py:775
+#: erpnext/support/doctype/service_level_agreement/service_level_agreement.py:777
msgid "Allow Resetting Service Level Agreement from Support Settings."
msgstr ""
@@ -4255,6 +4255,12 @@ msgstr ""
msgid "Allow Stale Exchange Rates"
msgstr ""
+#. Label of the allow_uom_with_conversion_rate_defined_in_item (Check) field in
+#. DocType 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Allow UOM with Conversion Rate Defined in Item"
+msgstr ""
+
#. Label of the allow_discount_change (Check) field in DocType 'POS Profile'
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
msgid "Allow User to Edit Discount"
@@ -4890,19 +4896,19 @@ msgstr ""
msgid "Amount to Bill"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1334
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1331
msgid "Amount {0} {1} against {2} {3}"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1345
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1342
msgid "Amount {0} {1} deducted against {2}"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1309
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1306
msgid "Amount {0} {1} transferred from {2} to {3}"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1315
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1312
msgid "Amount {0} {1} {2} {3}"
msgstr ""
@@ -4941,7 +4947,7 @@ msgstr ""
msgid "An Item Group is a way to classify items based on types."
msgstr ""
-#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:405
+#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:424
msgid "An error has been appeared while reposting item valuation via {0}"
msgstr ""
@@ -5453,11 +5459,11 @@ msgstr ""
msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}."
msgstr ""
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:216
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:217
msgid "As there are negative stock, you can not enable {0}."
msgstr ""
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:230
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:231
msgid "As there are reserved stock, you cannot disable {0}."
msgstr ""
@@ -5469,8 +5475,8 @@ msgstr ""
msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}."
msgstr ""
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:184
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:196
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:185
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:197
msgid "As {0} is enabled, you can not enable {1}."
msgstr ""
@@ -6019,7 +6025,7 @@ msgstr ""
msgid "Assets {assets_link} created for {item_code}"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:151
+#: erpnext/manufacturing/doctype/job_card/job_card.js:153
msgid "Assign Job to Employee"
msgstr ""
@@ -6350,7 +6356,7 @@ msgstr ""
msgid "Auto Reconcile Payments"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:441
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:442
msgid "Auto Reconciliation"
msgstr ""
@@ -6360,7 +6366,7 @@ msgstr ""
msgid "Auto Reconciliation Job Trigger"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:391
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:392
msgid "Auto Reconciliation has started in the background"
msgstr ""
@@ -7248,6 +7254,10 @@ msgstr ""
msgid "Bank Account Type"
msgstr ""
+#: erpnext/accounts/doctype/bank_transaction/bank_transaction.py:338
+msgid "Bank Account {} in Bank Transaction {} is not matching with Bank Account {}"
+msgstr ""
+
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:13
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:16
msgid "Bank Accounts"
@@ -7395,7 +7405,7 @@ msgstr ""
msgid "Bank Transaction {0} added as Payment Entry"
msgstr ""
-#: erpnext/accounts/doctype/bank_transaction/bank_transaction.py:129
+#: erpnext/accounts/doctype/bank_transaction/bank_transaction.py:143
msgid "Bank Transaction {0} is already fully reconciled"
msgstr ""
@@ -7725,7 +7735,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:89
#: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:115
-#: erpnext/public/js/controllers/transaction.js:2354
+#: erpnext/public/js/controllers/transaction.js:2367
#: erpnext/public/js/utils/barcode_scanner.js:260
#: erpnext/public/js/utils/serial_no_batch_selector.js:438
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -7756,7 +7766,7 @@ msgstr ""
msgid "Batch No is mandatory"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2569
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2570
msgid "Batch No {0} does not exists"
msgstr ""
@@ -9079,7 +9089,7 @@ msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr ""
#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1321
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2972
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2973
msgid "Can only make payment against unbilled {0}"
msgstr ""
@@ -9089,15 +9099,15 @@ msgstr ""
msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'"
msgstr ""
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:151
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:152
msgid "Can't change the valuation method, as there are transactions against some items which do not have its own valuation method"
msgstr ""
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:123
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:124
msgid "Can't disable batch wise valuation for active batches."
msgstr ""
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:120
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:121
msgid "Can't disable batch wise valuation for items with FIFO valuation method."
msgstr ""
@@ -9280,7 +9290,7 @@ msgstr ""
msgid "Cannot be a fixed asset item as Stock Ledger is created."
msgstr ""
-#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:206
+#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:212
msgid "Cannot cancel as processing of cancelled documents is pending."
msgstr ""
@@ -9288,7 +9298,7 @@ msgstr ""
msgid "Cannot cancel because submitted Stock Entry {0} exists"
msgstr ""
-#: erpnext/stock/stock_ledger.py:200
+#: erpnext/stock/stock_ledger.py:205
msgid "Cannot cancel the transaction. Reposting of item valuation on submission is not completed yet."
msgstr ""
@@ -9378,11 +9388,11 @@ msgstr ""
msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
msgstr ""
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:115
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:116
msgid "Cannot disable batch wise valuation for FIFO valuation method."
msgstr ""
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:101
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:109
msgid "Cannot enqueue multi docs for one company. {0} is already queued/running for company: {1}"
msgstr ""
@@ -9399,7 +9409,7 @@ msgstr ""
msgid "Cannot find a default warehouse for item {0}. Please set one in the Item Master or in Stock Settings."
msgstr ""
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:504
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:512
msgid "Cannot make any transactions until the deletion job is completed"
msgstr ""
@@ -9419,7 +9429,7 @@ msgstr ""
msgid "Cannot produce more than {0} items for {1}"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:357
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:359
msgid "Cannot receive from customer against negative outstanding"
msgstr ""
@@ -9439,7 +9449,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1467
#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1646
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1914
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1915
#: erpnext/controllers/accounts_controller.py:2901
#: erpnext/public/js/controllers/accounts.js:94
#: erpnext/public/js/controllers/taxes_and_totals.js:457
@@ -9470,7 +9480,7 @@ msgstr ""
msgid "Cannot set the field {0} for copying in variants"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2024
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2025
msgid "Cannot {0} from {1} without any negative outstanding invoice"
msgstr ""
@@ -9705,7 +9715,7 @@ msgstr ""
msgid "Caution"
msgstr ""
-#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:142
+#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:148
msgid "Caution: This might alter frozen accounts."
msgstr ""
@@ -9838,7 +9848,7 @@ msgstr ""
msgid "Channel Partner"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2343
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2344
#: erpnext/controllers/accounts_controller.py:2964
msgid "Charge of type 'Actual' in row {0} cannot be included in Item Rate or Paid Amount"
msgstr ""
@@ -10022,7 +10032,7 @@ msgstr ""
#. Label of the reference_date (Date) field in DocType 'Payment Entry'
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
-#: erpnext/public/js/controllers/transaction.js:2265
+#: erpnext/public/js/controllers/transaction.js:2278
msgid "Cheque/Reference Date"
msgstr ""
@@ -10070,7 +10080,7 @@ msgstr ""
#. Label of the child_row_reference (Data) field in DocType 'Quality
#. Inspection'
-#: erpnext/public/js/controllers/transaction.js:2360
+#: erpnext/public/js/controllers/transaction.js:2373
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
msgid "Child Row Reference"
msgstr ""
@@ -10235,7 +10245,7 @@ msgstr ""
msgid "Close Replied Opportunity After Days"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_controller.js:201
+#: erpnext/selling/page/point_of_sale/pos_controller.js:220
msgid "Close the POS"
msgstr ""
@@ -11242,7 +11252,7 @@ msgstr ""
msgid "Complete"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:187
+#: erpnext/manufacturing/doctype/job_card/job_card.js:190
#: erpnext/manufacturing/doctype/workstation/workstation.js:151
msgid "Complete Job"
msgstr ""
@@ -11375,8 +11385,8 @@ msgstr ""
msgid "Completed Qty cannot be greater than 'Qty to Manufacture'"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:222
-#: erpnext/manufacturing/doctype/job_card/job_card.js:294
+#: erpnext/manufacturing/doctype/job_card/job_card.js:238
+#: erpnext/manufacturing/doctype/job_card/job_card.js:334
#: erpnext/manufacturing/doctype/workstation/workstation.js:296
msgid "Completed Quantity"
msgstr ""
@@ -11988,7 +11998,7 @@ msgid "Content Type"
msgstr ""
#: erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js:162
-#: erpnext/public/js/controllers/transaction.js:2278
+#: erpnext/public/js/controllers/transaction.js:2291
#: erpnext/selling/doctype/quotation/quotation.js:345
msgid "Continue"
msgstr ""
@@ -12234,13 +12244,13 @@ msgstr ""
msgid "Corrective Action"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:351
+#: erpnext/manufacturing/doctype/job_card/job_card.js:391
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:358
+#: erpnext/manufacturing/doctype/job_card/job_card.js:398
#: erpnext/manufacturing/doctype/job_card/job_card.json
msgid "Corrective Operation"
msgstr ""
@@ -12793,8 +12803,8 @@ msgstr ""
#: erpnext/projects/doctype/task/task_tree.js:81
#: erpnext/public/js/communication.js:19 erpnext/public/js/communication.js:31
#: erpnext/public/js/communication.js:41
-#: erpnext/public/js/controllers/transaction.js:314
-#: erpnext/public/js/controllers/transaction.js:2401
+#: erpnext/public/js/controllers/transaction.js:327
+#: erpnext/public/js/controllers/transaction.js:2414
#: erpnext/selling/doctype/customer/customer.js:176
#: erpnext/selling/doctype/quotation/quotation.js:113
#: erpnext/selling/doctype/quotation/quotation.js:122
@@ -13089,7 +13099,7 @@ msgstr ""
msgid "Create a variant with the template image."
msgstr ""
-#: erpnext/stock/stock_ledger.py:1880
+#: erpnext/stock/stock_ledger.py:1889
msgid "Create an incoming stock transaction for the Item."
msgstr ""
@@ -13672,8 +13682,8 @@ msgstr ""
msgid "Currency can not be changed after making entries using some other currency"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1682
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1748
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1679
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1747
#: erpnext/accounts/utils.py:2219
msgid "Currency for {0} must be {1}"
msgstr ""
@@ -15476,11 +15486,11 @@ msgstr ""
msgid "Default Unit of Measure"
msgstr ""
-#: erpnext/stock/doctype/item/item.py:1263
+#: erpnext/stock/doctype/item/item.py:1265
msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item."
msgstr ""
-#: erpnext/stock/doctype/item/item.py:1246
+#: erpnext/stock/doctype/item/item.py:1248
msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM."
msgstr ""
@@ -15744,7 +15754,7 @@ msgstr ""
msgid "Deleting {0} and all associated Common Code documents..."
msgstr ""
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:486
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:499
msgid "Deletion in Progress!"
msgstr ""
@@ -16482,7 +16492,7 @@ msgstr ""
#: erpnext/projects/doctype/task_type/task_type.json
#: erpnext/projects/doctype/timesheet_detail/timesheet_detail.json
#: erpnext/public/js/bank_reconciliation_tool/data_table_manager.js:55
-#: erpnext/public/js/controllers/transaction.js:2342
+#: erpnext/public/js/controllers/transaction.js:2355
#: erpnext/selling/doctype/installation_note_item/installation_note_item.json
#: erpnext/selling/doctype/product_bundle/product_bundle.json
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
@@ -17147,7 +17157,7 @@ msgstr ""
msgid "Discount must be less than 100"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3445
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3446
msgid "Discount of {} applied as per Payment Term"
msgstr ""
@@ -17447,7 +17457,7 @@ msgstr ""
msgid "Do you still want to enable negative inventory?"
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:1055
+#: erpnext/public/js/controllers/transaction.js:1068
msgid "Do you want to clear the selected {0}?"
msgstr ""
@@ -17474,7 +17484,7 @@ msgstr ""
msgid "DocType"
msgstr ""
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:69
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:77
msgid "DocTypes should not be added manually to the 'Excluded DocTypes' table. You are only allowed to remove entries from it."
msgstr ""
@@ -17539,10 +17549,6 @@ msgstr ""
msgid "Document Type already used as a dimension"
msgstr ""
-#: erpnext/accounts/doctype/bank_transaction/bank_transaction.js:59
-msgid "Document {0} successfully uncleared"
-msgstr ""
-
#: erpnext/setup/install.py:172
msgid "Documentation"
msgstr ""
@@ -17880,7 +17886,7 @@ msgstr ""
msgid "Due Date cannot be before {0}"
msgstr ""
-#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:106
+#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:108
msgid "Due to stock closing entry {0}, you cannot repost item valuation before {1}"
msgstr ""
@@ -18557,7 +18563,7 @@ msgstr ""
msgid "Employee {0} does not belongs to the company {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:297
+#: erpnext/manufacturing/doctype/job_card/job_card.py:298
msgid "Employee {0} is currently working on another workstation. Please assign another employee."
msgstr ""
@@ -18805,8 +18811,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:233
-#: erpnext/manufacturing/doctype/job_card/job_card.js:301
+#: erpnext/manufacturing/doctype/job_card/job_card.js:272
+#: erpnext/manufacturing/doctype/job_card/job_card.js:341
#: 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
@@ -18891,8 +18897,8 @@ msgstr ""
msgid "Enter Supplier"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:258
-#: erpnext/manufacturing/doctype/job_card/job_card.js:327
+#: erpnext/manufacturing/doctype/job_card/job_card.js:298
+#: erpnext/manufacturing/doctype/job_card/job_card.js:367
#: erpnext/manufacturing/doctype/workstation/workstation.js:312
msgid "Enter Value"
msgstr ""
@@ -19041,7 +19047,7 @@ msgstr ""
#: erpnext/accounts/doctype/ledger_merge/ledger_merge.json
#: erpnext/accounts/doctype/payment_request/payment_request.py:446
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.json
-#: erpnext/manufacturing/doctype/job_card/job_card.py:868
+#: erpnext/manufacturing/doctype/job_card/job_card.py:869
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:294
msgid "Error"
@@ -19087,7 +19093,7 @@ msgstr ""
msgid "Error evaluating the criteria formula"
msgstr ""
-#: erpnext/accounts/doctype/bank_transaction/bank_transaction.py:227
+#: erpnext/accounts/doctype/bank_transaction/bank_transaction.py:303
msgid "Error in party matching for Bank Transaction {0}"
msgstr ""
@@ -19099,7 +19105,7 @@ msgstr ""
msgid "Error while processing deferred accounting for {0}"
msgstr ""
-#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:401
+#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:420
msgid "Error while reposting item valuation"
msgstr ""
@@ -19183,7 +19189,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:2167
+#: erpnext/stock/stock_ledger.py:2176
msgid "Example: Serial No {0} reserved in {1}."
msgstr ""
@@ -19197,7 +19203,7 @@ msgstr ""
msgid "Excess Materials Consumed"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:962
+#: erpnext/manufacturing/doctype/job_card/job_card.py:963
msgid "Excess Transfer"
msgstr ""
@@ -19384,7 +19390,7 @@ msgstr ""
msgid "Exit"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_controller.js:228
+#: erpnext/selling/page/point_of_sale/pos_controller.js:247
msgid "Exit Full Screen"
msgstr ""
@@ -19714,7 +19720,7 @@ msgstr ""
msgid "Extra Consumed Qty"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:228
+#: erpnext/manufacturing/doctype/job_card/job_card.py:229
msgid "Extra Job Card Quantity"
msgstr ""
@@ -19977,7 +19983,7 @@ msgid "Fetching Error"
msgstr ""
#: erpnext/accounts/doctype/dunning/dunning.js:135
-#: erpnext/public/js/controllers/transaction.js:1215
+#: erpnext/public/js/controllers/transaction.js:1228
msgid "Fetching exchange rates ..."
msgstr ""
@@ -20392,7 +20398,7 @@ msgid "First Response Due"
msgstr ""
#: erpnext/support/doctype/issue/test_issue.py:238
-#: erpnext/support/doctype/service_level_agreement/service_level_agreement.py:896
+#: erpnext/support/doctype/service_level_agreement/service_level_agreement.py:898
msgid "First Response SLA Failed by {}"
msgstr ""
@@ -20656,7 +20662,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:371
+#: erpnext/manufacturing/doctype/job_card/job_card.js:411
#: erpnext/manufacturing/doctype/job_card/job_card.json
msgid "For Operation"
msgstr ""
@@ -21429,8 +21435,8 @@ msgstr ""
msgid "Full Name"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_controller.js:207
-#: erpnext/selling/page/point_of_sale/pos_controller.js:227
+#: erpnext/selling/page/point_of_sale/pos_controller.js:226
+#: erpnext/selling/page/point_of_sale/pos_controller.js:246
msgid "Full Screen"
msgstr ""
@@ -22353,7 +22359,7 @@ msgstr ""
msgid "Group Same Items"
msgstr ""
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:130
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:131
msgid "Group Warehouses cannot be used in transactions. Please change the value of {0}"
msgstr ""
@@ -22694,7 +22700,7 @@ msgstr ""
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr ""
-#: erpnext/stock/stock_ledger.py:1865
+#: erpnext/stock/stock_ledger.py:1874
msgid "Here are the options to proceed:"
msgstr ""
@@ -22722,7 +22728,7 @@ msgstr ""
msgid "Hertz"
msgstr ""
-#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:403
+#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:422
msgid "Hi,"
msgstr ""
@@ -23148,6 +23154,12 @@ msgstr ""
msgid "If enabled, the item rate won't adjust to the valuation rate during internal transfers, but accounting will still use the valuation rate."
msgstr ""
+#. Description of the 'Allow UOM with Conversion Rate Defined in Item' (Check)
+#. field in DocType 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "If enabled, the system will allow selecting UOMs in sales and purchase transactions only if the conversion rate is set in the item master."
+msgstr ""
+
#. Description of the 'Ignore Available Stock' (Check) field in DocType
#. 'Production Plan'
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
@@ -23182,7 +23194,7 @@ msgstr ""
msgid "If more than one package of the same type (for print)"
msgstr ""
-#: erpnext/stock/stock_ledger.py:1875
+#: erpnext/stock/stock_ledger.py:1884
msgid "If not, you can Cancel / Submit this entry"
msgstr ""
@@ -23207,7 +23219,7 @@ msgstr ""
msgid "If the account is frozen, entries are allowed to restricted users."
msgstr ""
-#: erpnext/stock/stock_ledger.py:1868
+#: erpnext/stock/stock_ledger.py:1877
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 ""
@@ -23255,7 +23267,7 @@ msgstr ""
msgid "If this is unchecked, direct GL entries will be created to book deferred revenue or expense"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:749
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:744
msgid "If this is undesirable please cancel the corresponding Payment Entry."
msgstr ""
@@ -24229,7 +24241,7 @@ msgstr ""
msgid "Incorrect Movement Purpose"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:358
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:360
msgid "Incorrect Payment Type"
msgstr ""
@@ -24261,7 +24273,7 @@ msgid "Incorrect Type of Transaction"
msgstr ""
#: erpnext/stock/doctype/pick_list/pick_list.py:150
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:133
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:134
msgid "Incorrect Warehouse"
msgstr ""
@@ -24528,12 +24540,12 @@ msgstr ""
#: erpnext/stock/doctype/pick_list/pick_list.py:127
#: erpnext/stock/doctype/pick_list/pick_list.py:975
#: erpnext/stock/doctype/stock_entry/stock_entry.py:737
-#: erpnext/stock/serial_batch_bundle.py:984 erpnext/stock/stock_ledger.py:1562
-#: erpnext/stock/stock_ledger.py:2035
+#: erpnext/stock/serial_batch_bundle.py:984 erpnext/stock/stock_ledger.py:1571
+#: erpnext/stock/stock_ledger.py:2044
msgid "Insufficient Stock"
msgstr ""
-#: erpnext/stock/stock_ledger.py:2050
+#: erpnext/stock/stock_ledger.py:2059
msgid "Insufficient Stock for Batch"
msgstr ""
@@ -24647,7 +24659,7 @@ msgstr ""
msgid "Interest"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3082
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3083
msgid "Interest and/or dunning fee"
msgstr ""
@@ -24754,7 +24766,7 @@ msgstr ""
msgid "Invalid Account"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:397
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:400
#: erpnext/accounts/doctype/payment_request/payment_request.py:894
msgid "Invalid Allocated Amount"
msgstr ""
@@ -24775,7 +24787,7 @@ msgstr ""
msgid "Invalid Barcode. There is no Item attached to this barcode."
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:2597
+#: erpnext/public/js/controllers/transaction.js:2610
msgid "Invalid Blanket Order for the selected Customer and Item"
msgstr ""
@@ -24813,8 +24825,8 @@ msgstr ""
msgid "Invalid Document Type"
msgstr ""
-#: erpnext/stock/doctype/quality_inspection/quality_inspection.py:326
-#: erpnext/stock/doctype/quality_inspection/quality_inspection.py:331
+#: erpnext/stock/doctype/quality_inspection/quality_inspection.py:337
+#: erpnext/stock/doctype/quality_inspection/quality_inspection.py:342
msgid "Invalid Formula"
msgstr ""
@@ -24831,7 +24843,7 @@ msgstr ""
msgid "Invalid Item"
msgstr ""
-#: erpnext/stock/doctype/item/item.py:1401
+#: erpnext/stock/doctype/item/item.py:1403
msgid "Invalid Item Defaults"
msgstr ""
@@ -24873,7 +24885,7 @@ msgstr ""
msgid "Invalid Process Loss Configuration"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:708
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:705
msgid "Invalid Purchase Invoice"
msgstr ""
@@ -24916,6 +24928,10 @@ msgstr ""
msgid "Invalid Warehouse"
msgstr ""
+#: erpnext/accounts/doctype/bank_transaction/bank_transaction.py:355
+msgid "Invalid amount in accounting entries of {} {} for Account {}: {}"
+msgstr ""
+
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.py:312
msgid "Invalid condition expression"
msgstr ""
@@ -25798,7 +25814,7 @@ msgstr ""
msgid "It can take upto few hours for accurate stock values to be visible after merging items."
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:2041
+#: erpnext/public/js/controllers/transaction.js:2054
msgid "It is needed to fetch Item Details."
msgstr ""
@@ -25848,7 +25864,7 @@ 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:1098
+#: erpnext/controllers/taxes_and_totals.py:1114
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.json
#: erpnext/manufacturing/doctype/bom/bom.js:940
#: erpnext/manufacturing/doctype/bom/bom.json
@@ -26124,7 +26140,7 @@ msgstr ""
#: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:86
#: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:119
#: erpnext/projects/doctype/timesheet/timesheet.js:213
-#: erpnext/public/js/controllers/transaction.js:2316
+#: erpnext/public/js/controllers/transaction.js:2329
#: erpnext/public/js/stock_reservation.js:99
#: erpnext/public/js/stock_reservation.js:292 erpnext/public/js/utils.js:495
#: erpnext/public/js/utils.js:651
@@ -26203,7 +26219,7 @@ msgstr ""
msgid "Item Code required at Row No {0}"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_controller.js:755
+#: erpnext/selling/page/point_of_sale/pos_controller.js:774
#: erpnext/selling/page/point_of_sale/pos_item_details.js:274
msgid "Item Code: {0} is not available under warehouse {1}."
msgstr ""
@@ -26561,7 +26577,7 @@ msgstr ""
#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:359
#: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:92
#: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:134
-#: erpnext/public/js/controllers/transaction.js:2322
+#: erpnext/public/js/controllers/transaction.js:2335
#: erpnext/public/js/utils.js:741
#: erpnext/selling/doctype/quotation_item/quotation_item.json
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -27278,7 +27294,7 @@ 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:861
+#: erpnext/manufacturing/doctype/job_card/job_card.py:862
#: erpnext/manufacturing/doctype/operation/operation.json
#: erpnext/manufacturing/doctype/work_order/work_order.js:354
#: erpnext/manufacturing/doctype/work_order/work_order.json
@@ -27339,7 +27355,7 @@ msgstr ""
msgid "Job Card and Capacity Planning"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1270
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1275
msgid "Job Card {0} has been completed"
msgstr ""
@@ -27637,7 +27653,7 @@ msgstr ""
msgid "Kilowatt-Hour"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:863
+#: erpnext/manufacturing/doctype/job_card/job_card.py:864
msgid "Kindly cancel the Manufacturing Entries first against the work order {0}."
msgstr ""
@@ -28915,7 +28931,7 @@ msgstr ""
#. Label of the make (Data) field in DocType 'Vehicle'
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:76
-#: erpnext/manufacturing/doctype/job_card/job_card.js:392
+#: erpnext/manufacturing/doctype/job_card/job_card.js:432
#: erpnext/setup/doctype/vehicle/vehicle.json
msgid "Make"
msgstr ""
@@ -28968,12 +28984,12 @@ msgstr ""
msgid "Make Serial No / Batch from Work Order"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:53
+#: erpnext/manufacturing/doctype/job_card/job_card.js:54
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:282
msgid "Make Stock Entry"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:266
+#: erpnext/manufacturing/doctype/job_card/job_card.js:306
msgid "Make Subcontracting PO"
msgstr ""
@@ -29044,7 +29060,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/bom/bom.py:261
#: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py:71
#: erpnext/public/js/controllers/accounts.js:249
-#: erpnext/public/js/controllers/transaction.js:2719
+#: erpnext/public/js/controllers/transaction.js:2732
#: erpnext/public/js/utils/party.js:317
#: erpnext/stock/doctype/delivery_note/delivery_note.js:164
#: erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
@@ -29580,7 +29596,7 @@ msgstr ""
#: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:33
#: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:184
#: erpnext/buying/workspace/buying/buying.json
-#: erpnext/manufacturing/doctype/job_card/job_card.js:99
+#: erpnext/manufacturing/doctype/job_card/job_card.js:100
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:135
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
#: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
@@ -29736,7 +29752,7 @@ msgstr ""
#. Option for the 'Purpose' (Select) field in DocType 'Pick List'
#. Option for the 'Purpose' (Select) field in DocType 'Stock Entry'
#. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type'
-#: erpnext/manufacturing/doctype/job_card/job_card.js:109
+#: erpnext/manufacturing/doctype/job_card/job_card.js:110
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:90
#: erpnext/stock/doctype/item/item.json
@@ -29796,7 +29812,7 @@ msgstr ""
msgid "Materials are already received against the {0} {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:720
+#: erpnext/manufacturing/doctype/job_card/job_card.py:721
msgid "Materials needs to be transferred to the work in progress warehouse for the job card {0}"
msgstr ""
@@ -29973,7 +29989,7 @@ msgstr ""
msgid "Megawatt"
msgstr ""
-#: erpnext/stock/stock_ledger.py:1881
+#: erpnext/stock/stock_ledger.py:1890
msgid "Mention Valuation Rate in the Item master."
msgstr ""
@@ -30394,7 +30410,7 @@ msgstr ""
msgid "Missing Cost Center"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1223
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1220
msgid "Missing Default in Company"
msgstr ""
@@ -30406,7 +30422,7 @@ msgstr ""
msgid "Missing Finished Good"
msgstr ""
-#: erpnext/stock/doctype/quality_inspection/quality_inspection.py:311
+#: erpnext/stock/doctype/quality_inspection/quality_inspection.py:322
msgid "Missing Formula"
msgstr ""
@@ -31723,7 +31739,7 @@ msgstr ""
#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1507
#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1567
#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1581
-#: erpnext/stock/doctype/item/item.py:1362
+#: erpnext/stock/doctype/item/item.py:1364
msgid "No Permission"
msgstr ""
@@ -31741,6 +31757,10 @@ msgstr ""
msgid "No Remarks"
msgstr ""
+#: erpnext/public/js/utils/unreconcile.js:141
+msgid "No Selection"
+msgstr ""
+
#: erpnext/controllers/sales_and_purchase_return.py:906
msgid "No Serial / Batches are available for return"
msgstr ""
@@ -31847,7 +31867,7 @@ msgstr ""
msgid "No items to be received are overdue"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:450
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:451
msgid "No matches occurred via auto reconciliation"
msgstr ""
@@ -31920,7 +31940,7 @@ msgstr ""
msgid "No outstanding invoices require exchange rate revaluation"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2518
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2519
msgid "No outstanding {0} found for the {1} {2} which qualify the filters you have specified."
msgstr ""
@@ -32037,7 +32057,7 @@ msgstr ""
#: erpnext/assets/doctype/asset/asset.js:631
#: erpnext/controllers/buying_controller.py:202
#: erpnext/selling/doctype/product_bundle/product_bundle.py:72
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:72
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:80
msgid "Not Allowed"
msgstr ""
@@ -32048,8 +32068,8 @@ msgstr ""
msgid "Not Applicable"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_controller.js:754
-#: erpnext/selling/page/point_of_sale/pos_controller.js:783
+#: erpnext/selling/page/point_of_sale/pos_controller.js:773
+#: erpnext/selling/page/point_of_sale/pos_controller.js:802
msgid "Not Available"
msgstr ""
@@ -32767,7 +32787,7 @@ msgstr ""
msgid "Open Events"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_controller.js:190
+#: erpnext/selling/page/point_of_sale/pos_controller.js:209
msgid "Open Form View"
msgstr ""
@@ -33139,11 +33159,11 @@ msgstr ""
msgid "Operation time does not depend on quantity to produce"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:434
+#: erpnext/manufacturing/doctype/job_card/job_card.js:474
msgid "Operation {0} added multiple times in the work order {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1076
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1077
msgid "Operation {0} does not belong to the work order {1}"
msgstr ""
@@ -33900,6 +33920,10 @@ msgstr ""
msgid "POS"
msgstr ""
+#: erpnext/selling/page/point_of_sale/pos_controller.js:157
+msgid "POS Closed"
+msgstr ""
+
#. Name of a DocType
#. Label of the pos_closing_entry (Link) field in DocType 'POS Invoice Merge
#. Log'
@@ -34093,7 +34117,11 @@ msgstr ""
msgid "POS Transactions"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_controller.js:427
+#: erpnext/selling/page/point_of_sale/pos_controller.js:160
+msgid "POS has been closed at {0}. Please refresh the page."
+msgstr ""
+
+#: erpnext/selling/page/point_of_sale/pos_controller.js:446
msgid "POS invoice {0} created successfully"
msgstr ""
@@ -34293,7 +34321,7 @@ msgstr ""
msgid "Paid Amount After Tax (Company Currency)"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2031
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2032
msgid "Paid Amount cannot be greater than total negative outstanding amount {0}"
msgstr ""
@@ -34900,11 +34928,11 @@ msgstr ""
msgid "Party Type and Party is mandatory for {0} account"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:160
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:161
msgid "Party Type and Party is required for Receivable / Payable account {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:519
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:520
msgid "Party Type is mandatory"
msgstr ""
@@ -34917,7 +34945,7 @@ msgstr ""
msgid "Party can only be one of {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:522
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:523
msgid "Party is mandatory"
msgstr ""
@@ -34965,7 +34993,7 @@ msgstr ""
msgid "Pause"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:173
+#: erpnext/manufacturing/doctype/job_card/job_card.js:176
msgid "Pause Job"
msgstr ""
@@ -35556,7 +35584,7 @@ msgstr ""
msgid "Payment Type"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:604
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:607
msgid "Payment Type must be one of Receive, Pay and Internal Transfer"
msgstr ""
@@ -35598,7 +35626,7 @@ msgstr ""
msgid "Payment request failed"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:824
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:821
msgid "Payment term {0} not used in {1}"
msgstr ""
@@ -35738,7 +35766,7 @@ msgstr ""
msgid "Pending activities for today"
msgstr ""
-#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:208
+#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:214
msgid "Pending processing"
msgstr ""
@@ -36475,7 +36503,7 @@ msgstr ""
msgid "Please check either with operations or FG Based Operating Cost."
msgstr ""
-#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:409
+#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:428
msgid "Please check the error message and take necessary actions to fix the error and then restart the reposting again."
msgstr ""
@@ -36628,7 +36656,7 @@ msgstr ""
msgid "Please enter Item Code to get Batch Number"
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:2469
+#: erpnext/public/js/controllers/transaction.js:2482
msgid "Please enter Item Code to get batch no"
msgstr ""
@@ -36835,8 +36863,8 @@ msgstr ""
msgid "Please select Template Type to download template"
msgstr ""
-#: erpnext/controllers/taxes_and_totals.py:718
-#: erpnext/public/js/controllers/taxes_and_totals.js:705
+#: erpnext/controllers/taxes_and_totals.py:714
+#: erpnext/public/js/controllers/taxes_and_totals.js:706
msgid "Please select Apply Discount On"
msgstr ""
@@ -36962,7 +36990,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/bom/bom.js:599
#: erpnext/manufacturing/doctype/bom/bom.py:261
#: erpnext/public/js/controllers/accounts.js:249
-#: erpnext/public/js/controllers/transaction.js:2719
+#: erpnext/public/js/controllers/transaction.js:2732
msgid "Please select a Company first."
msgstr ""
@@ -36986,7 +37014,7 @@ msgstr ""
msgid "Please select a Warehouse"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1376
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1381
msgid "Please select a Work Order first."
msgstr ""
@@ -37309,7 +37337,7 @@ msgstr ""
msgid "Please set one of the following:"
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:2171
+#: erpnext/public/js/controllers/transaction.js:2184
msgid "Please set recurring after saving"
msgstr ""
@@ -37325,11 +37353,11 @@ msgstr ""
msgid "Please set the Item Code first"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1438
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1443
msgid "Please set the Target Warehouse in the Job Card"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1442
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1447
msgid "Please set the WIP Warehouse in the Job Card"
msgstr ""
@@ -37364,7 +37392,7 @@ msgstr ""
msgid "Please set {0} in BOM Creator {1}"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1220
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1217
msgid "Please set {0} in Company {1} to account for Exchange Gain / Loss"
msgstr ""
@@ -37380,7 +37408,7 @@ msgstr ""
msgid "Please share this email with your support team so that they can find and fix the issue."
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:2039
+#: erpnext/public/js/controllers/transaction.js:2052
msgid "Please specify"
msgstr ""
@@ -37420,7 +37448,7 @@ msgstr ""
msgid "Please supply the specified items at the best possible rates"
msgstr ""
-#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:207
+#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:213
msgid "Please try again in an hour."
msgstr ""
@@ -38093,7 +38121,7 @@ msgstr ""
msgid "Price Per Unit ({0})"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_controller.js:631
+#: erpnext/selling/page/point_of_sale/pos_controller.js:650
msgid "Price is not set for the item."
msgstr ""
@@ -38560,7 +38588,7 @@ msgstr ""
msgid "Priority cannot be lesser than 1."
msgstr ""
-#: erpnext/support/doctype/service_level_agreement/service_level_agreement.py:754
+#: erpnext/support/doctype/service_level_agreement/service_level_agreement.py:756
msgid "Priority has been changed to {0}."
msgstr ""
@@ -38646,6 +38674,10 @@ msgstr ""
msgid "Process Loss Qty"
msgstr ""
+#: erpnext/manufacturing/doctype/job_card/job_card.js:253
+msgid "Process Loss Quantity"
+msgstr ""
+
#. Name of a report
#: erpnext/manufacturing/report/process_loss_report/process_loss_report.json
msgid "Process Loss Report"
@@ -40446,7 +40478,8 @@ msgstr ""
msgid "Qty to Fetch"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:750
+#: erpnext/manufacturing/doctype/job_card/job_card.js:225
+#: erpnext/manufacturing/doctype/job_card/job_card.py:751
msgid "Qty to Manufacture"
msgstr ""
@@ -40654,7 +40687,7 @@ msgstr ""
msgid "Quality Inspection Template Name"
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:312
+#: erpnext/public/js/controllers/transaction.js:325
#: erpnext/stock/doctype/stock_entry/stock_entry.js:165
msgid "Quality Inspection(s)"
msgstr ""
@@ -40917,8 +40950,8 @@ msgid "Quantity required for Item {0} in row {1}"
msgstr ""
#: erpnext/manufacturing/doctype/bom/bom.py:604
-#: erpnext/manufacturing/doctype/job_card/job_card.js:243
-#: erpnext/manufacturing/doctype/job_card/job_card.js:311
+#: erpnext/manufacturing/doctype/job_card/job_card.js:282
+#: erpnext/manufacturing/doctype/job_card/job_card.js:351
#: erpnext/manufacturing/doctype/workstation/workstation.js:303
msgid "Quantity should be greater than 0"
msgstr ""
@@ -41896,7 +41929,7 @@ msgstr ""
msgid "Received Amount After Tax (Company Currency)"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1053
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1050
msgid "Received Amount cannot be greater than Paid Amount"
msgstr ""
@@ -42129,6 +42162,12 @@ msgstr ""
msgid "Recoverable Standard Rated expenses should not be set when Reverse Charge Applicable is Y"
msgstr ""
+#. Label of the recreate_stock_ledgers (Check) field in DocType 'Repost Item
+#. Valuation'
+#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
+msgid "Recreate Stock Ledgers"
+msgstr ""
+
#. Label of the recurse_for (Float) field in DocType 'Pricing Rule'
#. Label of the recurse_for (Float) field in DocType 'Promotional Scheme
#. Product Discount'
@@ -42312,7 +42351,7 @@ msgstr ""
msgid "Reference Date"
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:2277
+#: erpnext/public/js/controllers/transaction.js:2290
msgid "Reference Date for Early Payment Discount"
msgstr ""
@@ -42336,7 +42375,7 @@ msgstr ""
msgid "Reference Doctype"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:660
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:657
msgid "Reference Doctype must be one of {0}"
msgstr ""
@@ -42443,7 +42482,7 @@ msgstr ""
msgid "Reference No & Reference Date is required for {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1301
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1298
msgid "Reference No and Reference Date is mandatory for Bank transaction"
msgstr ""
@@ -42573,7 +42612,7 @@ msgstr ""
msgid "References to Sales Orders are Incomplete"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:742
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:737
msgid "References {0} of type {1} had no outstanding amount left before submitting the Payment Entry. Now they have a negative outstanding amount."
msgstr ""
@@ -42588,6 +42627,7 @@ msgid "Referral Sales Partner"
msgstr ""
#: erpnext/public/js/plant_floor_visual/visual_plant.js:151
+#: erpnext/selling/page/point_of_sale/pos_controller.js:162
#: erpnext/selling/page/sales_funnel/sales_funnel.js:53
msgid "Refresh"
msgstr ""
@@ -43506,7 +43546,7 @@ msgstr ""
msgid "Reserved Quantity for Production"
msgstr ""
-#: erpnext/stock/stock_ledger.py:2173
+#: erpnext/stock/stock_ledger.py:2182
msgid "Reserved Serial No."
msgstr ""
@@ -43522,11 +43562,11 @@ msgstr ""
#: erpnext/stock/doctype/pick_list/pick_list.js:153
#: erpnext/stock/report/reserved_stock/reserved_stock.json
#: erpnext/stock/report/stock_balance/stock_balance.py:498
-#: erpnext/stock/stock_ledger.py:2157
+#: erpnext/stock/stock_ledger.py:2166
msgid "Reserved Stock"
msgstr ""
-#: erpnext/stock/stock_ledger.py:2203
+#: erpnext/stock/stock_ledger.py:2212
msgid "Reserved Stock for Batch"
msgstr ""
@@ -43783,7 +43823,7 @@ msgstr ""
msgid "Resume"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:158
+#: erpnext/manufacturing/doctype/job_card/job_card.js:160
msgid "Resume Job"
msgstr ""
@@ -44375,11 +44415,11 @@ msgstr ""
msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}."
msgstr ""
-#: erpnext/stock/doctype/quality_inspection/quality_inspection.py:330
+#: erpnext/stock/doctype/quality_inspection/quality_inspection.py:341
msgid "Row #{0}: Acceptance Criteria Formula is incorrect."
msgstr ""
-#: erpnext/stock/doctype/quality_inspection/quality_inspection.py:310
+#: erpnext/stock/doctype/quality_inspection/quality_inspection.py:321
msgid "Row #{0}: Acceptance Criteria Formula is required."
msgstr ""
@@ -44396,16 +44436,16 @@ msgstr ""
msgid "Row #{0}: Account {1} does not belong to company {2}"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:397
msgid "Row #{0}: Allocated Amount cannot be greater than Outstanding Amount of Payment Request {1}"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:370
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:475
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:373
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:478
msgid "Row #{0}: Allocated Amount cannot be greater than outstanding amount."
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:489
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:490
msgid "Row #{0}: Allocated amount:{1} is greater than outstanding amount:{2} for Payment Term {3}"
msgstr ""
@@ -44425,7 +44465,7 @@ msgstr ""
msgid "Row #{0}: Batch No {1} is already selected."
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:870
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:867
msgid "Row #{0}: Cannot allocate more than {1} against payment term {2}"
msgstr ""
@@ -44453,7 +44493,7 @@ msgstr ""
msgid "Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}."
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:957
+#: erpnext/manufacturing/doctype/job_card/job_card.py:958
msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}"
msgstr ""
@@ -44569,7 +44609,7 @@ msgstr ""
msgid "Row #{0}: Item {1} is not a stock item"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:768
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:763
msgid "Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher"
msgstr ""
@@ -44712,7 +44752,7 @@ msgstr ""
msgid "Row #{0}: Start Time must be before End Time"
msgstr ""
-#: erpnext/stock/doctype/quality_inspection/quality_inspection.py:214
+#: erpnext/stock/doctype/quality_inspection/quality_inspection.py:225
msgid "Row #{0}: Status is mandatory"
msgstr ""
@@ -44773,7 +44813,7 @@ msgstr ""
msgid "Row #{0}: {1} can not be negative for item {2}"
msgstr ""
-#: erpnext/stock/doctype/quality_inspection/quality_inspection.py:323
+#: erpnext/stock/doctype/quality_inspection/quality_inspection.py:334
msgid "Row #{0}: {1} is not a valid reading field. Please refer to the field description."
msgstr ""
@@ -44885,7 +44925,7 @@ msgstr ""
msgid "Row #{}: {} {} does not exist."
msgstr ""
-#: erpnext/stock/doctype/item/item.py:1394
+#: erpnext/stock/doctype/item/item.py:1396
msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}."
msgstr ""
@@ -44901,7 +44941,7 @@ msgstr ""
msgid "Row {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:674
+#: erpnext/manufacturing/doctype/job_card/job_card.py:675
msgid "Row {0} : Operation is required against the raw material item {1}"
msgstr ""
@@ -44998,7 +45038,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory.
msgstr ""
#: erpnext/accounts/doctype/journal_entry/journal_entry.py:976
-#: erpnext/controllers/taxes_and_totals.py:1178
+#: erpnext/controllers/taxes_and_totals.py:1194
msgid "Row {0}: Exchange Rate is mandatory"
msgstr ""
@@ -45026,7 +45066,7 @@ msgstr ""
msgid "Row {0}: From Time and To Time is mandatory."
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:259
+#: erpnext/manufacturing/doctype/job_card/job_card.py:260
#: erpnext/projects/doctype/timesheet/timesheet.py:212
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr ""
@@ -45035,7 +45075,7 @@ msgstr ""
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:250
+#: erpnext/manufacturing/doctype/job_card/job_card.py:251
msgid "Row {0}: From time must be less than to time"
msgstr ""
@@ -46256,7 +46296,7 @@ msgstr ""
#. Label of the sample_size (Float) field in DocType 'Quality Inspection'
#: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:93
-#: erpnext/public/js/controllers/transaction.js:2335
+#: erpnext/public/js/controllers/transaction.js:2348
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
msgid "Sample Size"
msgstr ""
@@ -46306,7 +46346,7 @@ msgstr ""
msgid "Save"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_controller.js:199
+#: erpnext/selling/page/point_of_sale/pos_controller.js:218
msgid "Save as Draft"
msgstr ""
@@ -46730,7 +46770,7 @@ msgstr ""
msgid "Select Company"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:389
+#: erpnext/manufacturing/doctype/job_card/job_card.js:429
msgid "Select Corrective Operation"
msgstr ""
@@ -46766,7 +46806,7 @@ msgstr ""
msgid "Select DocType"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:144
+#: erpnext/manufacturing/doctype/job_card/job_card.js:146
msgid "Select Employees"
msgstr ""
@@ -46783,7 +46823,7 @@ msgstr ""
msgid "Select Items based on Delivery Date"
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:2371
+#: erpnext/public/js/controllers/transaction.js:2384
msgid "Select Items for Quality Inspection"
msgstr ""
@@ -47138,7 +47178,7 @@ msgid "Send Now"
msgstr ""
#. Label of the send_sms (Button) field in DocType 'SMS Center'
-#: erpnext/public/js/controllers/transaction.js:495
+#: erpnext/public/js/controllers/transaction.js:508
#: erpnext/selling/doctype/sms_center/sms_center.json
msgid "Send SMS"
msgstr ""
@@ -47296,7 +47336,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:74
#: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:114
-#: erpnext/public/js/controllers/transaction.js:2348
+#: erpnext/public/js/controllers/transaction.js:2361
#: erpnext/public/js/utils/serial_no_batch_selector.js:421
#: erpnext/selling/doctype/installation_note_item/installation_note_item.json
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -47415,7 +47455,7 @@ msgstr ""
msgid "Serial No {0} does not exist"
msgstr ""
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2563
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2564
msgid "Serial No {0} does not exists"
msgstr ""
@@ -47439,7 +47479,7 @@ msgstr ""
msgid "Serial No {0} not found"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_controller.js:785
+#: erpnext/selling/page/point_of_sale/pos_controller.js:804
msgid "Serial No: {0} has already been transacted into another POS Invoice."
msgstr ""
@@ -47464,7 +47504,7 @@ msgstr ""
msgid "Serial Nos are created successfully"
msgstr ""
-#: erpnext/stock/stock_ledger.py:2163
+#: erpnext/stock/stock_ledger.py:2172
msgid "Serial Nos are reserved in Stock Reservation Entries, you need to unreserve them before proceeding."
msgstr ""
@@ -47833,7 +47873,7 @@ msgstr ""
msgid "Service Level Agreement for {0} {1} already exists."
msgstr ""
-#: erpnext/support/doctype/service_level_agreement/service_level_agreement.py:761
+#: erpnext/support/doctype/service_level_agreement/service_level_agreement.py:763
msgid "Service Level Agreement has been changed to {0}."
msgstr ""
@@ -47893,12 +47933,12 @@ msgid "Service Stop Date"
msgstr ""
#: erpnext/accounts/deferred_revenue.py:44
-#: erpnext/public/js/controllers/transaction.js:1391
+#: erpnext/public/js/controllers/transaction.js:1404
msgid "Service Stop Date cannot be after Service End Date"
msgstr ""
#: erpnext/accounts/deferred_revenue.py:41
-#: erpnext/public/js/controllers/transaction.js:1388
+#: erpnext/public/js/controllers/transaction.js:1401
msgid "Service Stop Date cannot be before Service Start Date"
msgstr ""
@@ -47935,8 +47975,8 @@ msgstr ""
msgid "Set Default Supplier"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:260
-#: erpnext/manufacturing/doctype/job_card/job_card.js:329
+#: erpnext/manufacturing/doctype/job_card/job_card.js:300
+#: erpnext/manufacturing/doctype/job_card/job_card.js:369
msgid "Set Finished Good Quantity"
msgstr ""
@@ -49237,7 +49277,7 @@ msgstr ""
msgid "Split qty cannot be grater than or equal to asset qty"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2544
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2545
msgid "Splitting {0} {1} into {2} rows as per Payment Terms"
msgstr ""
@@ -49426,7 +49466,7 @@ msgstr ""
msgid "Start Import"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:138
+#: erpnext/manufacturing/doctype/job_card/job_card.js:140
#: erpnext/manufacturing/doctype/workstation/workstation.js:124
msgid "Start Job"
msgstr ""
@@ -49788,7 +49828,7 @@ msgstr ""
msgid "Status must be one of {0}"
msgstr ""
-#: erpnext/stock/doctype/quality_inspection/quality_inspection.py:280
+#: erpnext/stock/doctype/quality_inspection/quality_inspection.py:291
msgid "Status set to rejected as there are one or more rejected readings."
msgstr ""
@@ -49978,7 +50018,7 @@ msgstr ""
msgid "Stock Entry {0} created"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1302
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1307
msgid "Stock Entry {0} has created"
msgstr ""
@@ -50207,10 +50247,10 @@ msgstr ""
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1270
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1287
#: erpnext/stock/doctype/stock_settings/stock_settings.json
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:185
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:197
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:217
-#: erpnext/stock/doctype/stock_settings/stock_settings.py:231
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:186
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:198
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:218
+#: erpnext/stock/doctype/stock_settings/stock_settings.py:232
msgid "Stock Reservation"
msgstr ""
@@ -50502,7 +50542,7 @@ msgstr ""
msgid "Stock not available for Item {0} in Warehouse {1}."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_controller.js:765
+#: erpnext/selling/page/point_of_sale/pos_controller.js:784
msgid "Stock quantity not enough for Item Code: {0} under warehouse {1}. Available quantity {2} {3}."
msgstr ""
@@ -52686,7 +52726,7 @@ msgstr ""
#. Label of the taxable_amount (Currency) field in DocType 'Tax Withheld
#. Vouchers'
#: erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json
-#: erpnext/controllers/taxes_and_totals.py:1098
+#: erpnext/controllers/taxes_and_totals.py:1114
msgid "Taxable Amount"
msgstr ""
@@ -53506,7 +53546,7 @@ msgstr ""
msgid "The shares don't exist with the {0}"
msgstr ""
-#: erpnext/stock/stock_ledger.py:785
+#: erpnext/stock/stock_ledger.py:790
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 ""
@@ -53573,7 +53613,7 @@ msgstr ""
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:753
+#: erpnext/manufacturing/doctype/job_card/job_card.py:754
msgid "The {0} ({1}) must be equal to {2} ({3})"
msgstr ""
@@ -53581,7 +53621,7 @@ msgstr ""
msgid "The {0} {1} created successfully"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:859
+#: erpnext/manufacturing/doctype/job_card/job_card.py:860
msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
msgstr ""
@@ -53653,7 +53693,7 @@ msgstr ""
msgid "There was an error creating Bank Account while linking with Plaid."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_controller.js:262
+#: erpnext/selling/page/point_of_sale/pos_controller.js:281
msgid "There was an error saving the document."
msgstr ""
@@ -54060,7 +54100,7 @@ msgstr ""
msgid "Time in mins."
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:738
+#: erpnext/manufacturing/doctype/job_card/job_card.py:739
msgid "Time logs are required for {0} {1}"
msgstr ""
@@ -54623,7 +54663,7 @@ msgstr ""
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."
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2334
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2335
#: erpnext/controllers/accounts_controller.py:2955
msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included"
msgstr ""
@@ -54659,7 +54699,7 @@ msgstr ""
msgid "To use a different finance book, please uncheck 'Include Default FB Entries'"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_controller.js:193
+#: erpnext/selling/page/point_of_sale/pos_controller.js:212
msgid "Toggle Recent Orders"
msgstr ""
@@ -54979,7 +55019,7 @@ 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:749
+#: erpnext/manufacturing/doctype/job_card/job_card.py:750
#: erpnext/manufacturing/report/job_card_summary/job_card_summary.py:174
msgid "Total Completed Qty"
msgstr ""
@@ -55619,8 +55659,10 @@ msgid "Traceability"
msgstr ""
#. Label of the track_semi_finished_goods (Check) field in DocType 'BOM'
+#. Label of the track_semi_finished_goods (Check) field in DocType 'Job Card'
#. Label of the track_semi_finished_goods (Check) field in DocType 'Work Order'
#: erpnext/manufacturing/doctype/bom/bom.json
+#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
msgid "Track Semi Finished Goods"
msgstr ""
@@ -55656,7 +55698,7 @@ msgstr ""
#. Option for the 'Apply On' (Select) field in DocType 'Promotional Scheme'
#. 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:461
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10
@@ -55691,7 +55733,7 @@ msgstr ""
msgid "Transaction Date"
msgstr ""
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:487
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:500
msgid "Transaction Deletion Document: {0} is running for this Company. {1}"
msgstr ""
@@ -55761,17 +55803,17 @@ msgstr ""
msgid "Transaction currency: {0} cannot be different from Bank Account({1}) currency: {2}"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:731
+#: erpnext/manufacturing/doctype/job_card/job_card.py:732
msgid "Transaction not allowed against stopped Work Order {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1327
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1324
msgid "Transaction reference no {0} dated {1}"
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:461
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:462
#: 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
@@ -56323,9 +56365,14 @@ msgid "UTM Source"
msgstr ""
#: erpnext/public/js/utils/unreconcile.js:25
+#: erpnext/public/js/utils/unreconcile.js:127
msgid "UnReconcile"
msgstr ""
+#: erpnext/public/js/utils/unreconcile.js:124
+msgid "UnReconcile Allocations"
+msgstr ""
+
#: erpnext/setup/utils.py:137
msgid "Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually"
msgstr ""
@@ -56522,7 +56569,7 @@ msgstr ""
msgid "Unreconcile Payment Entries"
msgstr ""
-#: erpnext/accounts/doctype/bank_transaction/bank_transaction.js:17
+#: erpnext/accounts/doctype/bank_transaction/bank_transaction.js:40
msgid "Unreconcile Transaction"
msgstr ""
@@ -56631,8 +56678,8 @@ msgstr ""
#: erpnext/accounts/doctype/account/account.js:204
#: erpnext/accounts/doctype/cost_center/cost_center.js:107
-#: erpnext/manufacturing/doctype/job_card/job_card.js:259
-#: erpnext/manufacturing/doctype/job_card/job_card.js:328
+#: erpnext/manufacturing/doctype/job_card/job_card.js:299
+#: erpnext/manufacturing/doctype/job_card/job_card.js:368
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:500
#: erpnext/public/js/utils.js:593 erpnext/public/js/utils.js:897
#: erpnext/public/js/utils/barcode_scanner.js:183
@@ -56850,7 +56897,7 @@ msgstr ""
msgid "Updated via 'Time Log' (In Minutes)"
msgstr ""
-#: erpnext/stock/doctype/item/item.py:1378
+#: erpnext/stock/doctype/item/item.py:1380
msgid "Updating Variants..."
msgstr ""
@@ -57393,11 +57440,11 @@ msgstr ""
msgid "Valuation Rate (In / Out)"
msgstr ""
-#: erpnext/stock/stock_ledger.py:1884
+#: erpnext/stock/stock_ledger.py:1893
msgid "Valuation Rate Missing"
msgstr ""
-#: erpnext/stock/stock_ledger.py:1862
+#: erpnext/stock/stock_ledger.py:1871
msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}."
msgstr ""
@@ -57428,7 +57475,7 @@ msgstr ""
msgid "Valuation rate for the item as per Sales Invoice (Only for Internal Transfers)"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2358
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2359
#: erpnext/controllers/accounts_controller.py:2979
msgid "Valuation type charges can not be marked as Inclusive"
msgstr ""
@@ -58016,14 +58063,10 @@ msgstr ""
msgid "Voucher Type"
msgstr ""
-#: erpnext/accounts/doctype/bank_transaction/bank_transaction.py:188
+#: erpnext/accounts/doctype/bank_transaction/bank_transaction.py:191
msgid "Voucher {0} is over-allocated by {1}"
msgstr ""
-#: erpnext/accounts/doctype/bank_transaction/bank_transaction.py:261
-msgid "Voucher {0} value is broken: {1}"
-msgstr ""
-
#. Name of a report
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.json
msgid "Voucher-wise Balance"
@@ -58468,7 +58511,7 @@ msgstr ""
msgid "Warn for new Request for Quotations"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:750
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:745
#: erpnext/controllers/accounts_controller.py:1946
#: erpnext/stock/doctype/delivery_trip/delivery_trip.js:145
#: erpnext/utilities/transaction_base.py:123
@@ -58479,7 +58522,7 @@ msgstr ""
msgid "Warning - Row {0}: Billing Hours are more than Actual Hours"
msgstr ""
-#: erpnext/stock/stock_ledger.py:795
+#: erpnext/stock/stock_ledger.py:800
msgid "Warning on Negative Stock"
msgstr ""
@@ -59506,7 +59549,7 @@ msgstr ""
msgid "You can set it as a machine name or operation type. For example, stiching machine 12"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1159
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1160
msgid "You can't make any changes to Job Card since Work Order is closed."
msgstr ""
@@ -59550,7 +59593,7 @@ msgstr ""
msgid "You cannot redeem more than {0}."
msgstr ""
-#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:144
+#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:150
msgid "You cannot repost item valuation before {}"
msgstr ""
@@ -59606,11 +59649,11 @@ msgstr ""
msgid "You haven't created a {0} yet"
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_controller.js:252
+#: erpnext/selling/page/point_of_sale/pos_controller.js:271
msgid "You must add atleast one item to save it as draft."
msgstr ""
-#: erpnext/selling/page/point_of_sale/pos_controller.js:677
+#: erpnext/selling/page/point_of_sale/pos_controller.js:696
msgid "You must select a customer before adding an item."
msgstr ""
@@ -59696,7 +59739,7 @@ msgstr ""
msgid "`Allow Negative rates for Items`"
msgstr ""
-#: erpnext/stock/stock_ledger.py:1876
+#: erpnext/stock/stock_ledger.py:1885
msgid "after"
msgstr ""
@@ -59882,7 +59925,7 @@ msgstr ""
msgid "out of 5"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1320
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1317
msgid "paid to"
msgstr ""
@@ -59918,7 +59961,7 @@ msgstr ""
msgid "per hour"
msgstr ""
-#: erpnext/stock/stock_ledger.py:1877
+#: erpnext/stock/stock_ledger.py:1886
msgid "performing either one below:"
msgstr ""
@@ -59943,7 +59986,7 @@ msgstr ""
msgid "ratings"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1320
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1317
msgid "received from"
msgstr ""
@@ -60084,7 +60127,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:455
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:456
msgid "{0} Transaction(s) Reconciled"
msgstr ""
@@ -60176,7 +60219,7 @@ msgstr ""
msgid "{0} for {1}"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:448
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:453
msgid "{0} has Payment Term based allocation enabled. Select a Payment Term for Row #{1} in Payment References section"
msgstr ""
@@ -60205,7 +60248,7 @@ msgstr ""
msgid "{0} is added multiple times on rows: {1}"
msgstr ""
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:189
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:197
msgid "{0} is already running for {1}"
msgstr ""
@@ -60214,7 +60257,7 @@ msgid "{0} is blocked so this transaction cannot proceed"
msgstr ""
#: erpnext/accounts/doctype/budget/budget.py:57
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:647
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:644
#: erpnext/accounts/report/general_ledger/general_ledger.py:53
#: erpnext/accounts/report/pos_register/pos_register.py:107
#: erpnext/controllers/trends.py:50
@@ -60262,7 +60305,7 @@ msgstr ""
msgid "{0} is not enabled in {1}"
msgstr ""
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:197
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:205
msgid "{0} is not running. Cannot trigger events for this Document"
msgstr ""
@@ -60270,7 +60313,7 @@ msgstr ""
msgid "{0} is not the default supplier for any items."
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3044
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3045
msgid "{0} is on hold till {1}"
msgstr ""
@@ -60305,7 +60348,7 @@ msgstr ""
msgid "{0} not found for item {1}"
msgstr ""
-#: erpnext/support/doctype/service_level_agreement/service_level_agreement.py:696
+#: erpnext/support/doctype/service_level_agreement/service_level_agreement.py:698
msgid "{0} parameter is invalid"
msgstr ""
@@ -60333,16 +60376,16 @@ msgstr ""
msgid "{0} units of {1} are required in {2} with the inventory dimension: {3} ({4}) on {5} {6} for {7} to complete the transaction."
msgstr ""
-#: erpnext/stock/stock_ledger.py:1535 erpnext/stock/stock_ledger.py:2026
-#: erpnext/stock/stock_ledger.py:2040
+#: erpnext/stock/stock_ledger.py:1544 erpnext/stock/stock_ledger.py:2035
+#: erpnext/stock/stock_ledger.py:2049
msgid "{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction."
msgstr ""
-#: erpnext/stock/stock_ledger.py:2150 erpnext/stock/stock_ledger.py:2196
+#: erpnext/stock/stock_ledger.py:2159 erpnext/stock/stock_ledger.py:2205
msgid "{0} units of {1} needed in {2} on {3} {4} to complete this transaction."
msgstr ""
-#: erpnext/stock/stock_ledger.py:1529
+#: erpnext/stock/stock_ledger.py:1538
msgid "{0} units of {1} needed in {2} to complete this transaction."
msgstr ""
@@ -60362,7 +60405,7 @@ msgstr ""
msgid "{0} will be given as discount."
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:868
+#: erpnext/manufacturing/doctype/job_card/job_card.py:869
msgid "{0} {1}"
msgstr ""
@@ -60370,7 +60413,7 @@ msgstr ""
msgid "{0} {1} Manually"
msgstr ""
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:459
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:460
msgid "{0} {1} Partially Reconciled"
msgstr ""
@@ -60382,9 +60425,9 @@ msgstr ""
msgid "{0} {1} created"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:609
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:667
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2782
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:611
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:664
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2783
msgid "{0} {1} does not exist"
msgstr ""
@@ -60392,11 +60435,11 @@ msgstr ""
msgid "{0} {1} has accounting entries in currency {2} for company {3}. Please select a receivable or payable account with currency {2}."
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:458
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:463
msgid "{0} {1} has already been fully paid."
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:470
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:473
msgid "{0} {1} has already been partly paid. Please use the 'Get Outstanding Invoice' or the 'Get Outstanding Orders' button to get the latest outstanding amounts."
msgstr ""
@@ -60418,7 +60461,7 @@ msgstr ""
msgid "{0} {1} is already linked to Common Code {2}."
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:697
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:694
msgid "{0} {1} is associated with {2}, but Party Account is {3}"
msgstr ""
@@ -60455,7 +60498,7 @@ msgstr ""
msgid "{0} {1} is not active"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:674
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:671
msgid "{0} {1} is not associated with {2} {3}"
msgstr ""
@@ -60468,11 +60511,11 @@ msgstr ""
msgid "{0} {1} is not submitted"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:707
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:704
msgid "{0} {1} is on hold"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:713
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:710
msgid "{0} {1} must be submitted"
msgstr ""
@@ -60560,8 +60603,8 @@ msgstr ""
msgid "{0}'s {1} cannot be after {2}'s Expected End Date."
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1133
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1141
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1134
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1142
msgid "{0}, complete the operation {1} before the operation {2}."
msgstr ""
@@ -60676,3 +60719,7 @@ msgstr ""
msgid "{} {} is already linked with {} {}"
msgstr ""
+#: erpnext/accounts/doctype/bank_transaction/bank_transaction.py:347
+msgid "{} {} is not affecting bank account {}"
+msgstr ""
+