From 8e930d0ef1360049d9b925e374fda40f4f6ee18d Mon Sep 17 00:00:00 2001
From: MochaMind <developers@erpnext.com>
Date: Mon, 8 Jun 2026 16:45:28 +0530
Subject: [PATCH] chore: update POT file (#55691)

---
 erpnext/locale/main.pot | 2720 +++++++++++++++++++++------------------
 1 file changed, 1443 insertions(+), 1277 deletions(-)

diff --git a/erpnext/locale/main.pot b/erpnext/locale/main.pot
index a04eff1a2c8..b56303ca9b6 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-05-31 10:17+0000\n"
-"PO-Revision-Date: 2026-05-31 10:17+0000\n"
+"POT-Creation-Date: 2026-06-07 10:19+0000\n"
+"PO-Revision-Date: 2026-06-07 10:19+0000\n"
 "Last-Translator: hello@frappe.io\n"
 "Language-Team: hello@frappe.io\n"
 "MIME-Version: 1.0\n"
@@ -279,7 +279,7 @@ msgstr ""
 msgid "'Based On' and 'Group By' can not be same"
 msgstr ""
 
-#: erpnext/selling/report/inactive_customers/inactive_customers.py:18
+#: erpnext/selling/report/inactive_customers/inactive_customers.py:21
 msgid "'Days Since Last Order' must be greater than or equal to zero"
 msgstr ""
 
@@ -333,7 +333,7 @@ msgstr ""
 msgid "'Update Stock' can not be checked because items are not delivered via {0}"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:414
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:428
 msgid "'Update Stock' cannot be checked for fixed asset sale"
 msgstr ""
 
@@ -461,6 +461,11 @@ msgstr ""
 msgid "* Will be calculated in the transaction."
 msgstr ""
 
+#: erpnext/stock/doctype/item/item_prices.html:128
+#: erpnext/stock/doctype/item/item_prices.html:136
+msgid "+ Add Price"
+msgstr ""
+
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:112
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:360
 msgid "0 - 30 Days"
@@ -665,6 +670,11 @@ msgstr ""
 msgid "<div id=\"stock-levels-placeholder\"></div>"
 msgstr ""
 
+#. Content of the 'Prices HTML' (HTML) field in DocType 'Item'
+#: erpnext/stock/doctype/item/item.json
+msgid "<div id=\\\"item-prices-container\\\"></div>"
+msgstr ""
+
 #. Content of the 'uom_help_html' (HTML) field in DocType 'Item'
 #: erpnext/stock/doctype/item/item.json
 msgid "<div style=\"margin-bottom:10px; color: var(--gray-500) !important;\">Define alternate units for this item. Eg: 1 Box = 12 Nos, set conversion factor as 12. (Will also apply for variants) <a href=\"https://docs.frappe.io/erpnext/uom\" target=\"_blank\">Learn more &#8594;</a></div>"
@@ -836,7 +846,7 @@ msgstr ""
 msgid "<p>Posting Date {0} cannot be before Purchase Order date for the following:</p><ul>"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_settings/stock_settings.js:75
+#: erpnext/stock/doctype/stock_settings/stock_settings.js:134
 msgid "<p>Price List Rate has not been set as editable in Selling Settings. In this scenario, setting <strong>Update Price List Based On</strong> to <strong>Price List Rate</strong> will prevent auto-updation of Item Price.</p>Are you sure you want to continue?"
 msgstr ""
 
@@ -1014,7 +1024,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:1764
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1768
 msgid "A Reverse Journal Entry {0} already exists for this Journal Entry."
 msgstr ""
 
@@ -1206,7 +1216,7 @@ msgid "Accepted Qty in Stock UOM"
 msgstr ""
 
 #. Label of the qty (Float) field in DocType 'Purchase Receipt Item'
-#: erpnext/public/js/controllers/transaction.js:2847
+#: erpnext/public/js/controllers/transaction.js:2848
 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
 msgid "Accepted Quantity"
 msgstr ""
@@ -1238,7 +1248,7 @@ msgstr ""
 msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1082
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1159
 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry."
 msgstr ""
 
@@ -1356,7 +1366,7 @@ msgstr ""
 msgid "Account Manager"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1009
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1040
 #: erpnext/controllers/accounts_controller.py:2396
 msgid "Account Missing"
 msgstr ""
@@ -1542,7 +1552,7 @@ msgstr ""
 msgid "Account {0} does not belong to company: {1}"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:587
+#: erpnext/accounts/doctype/account/account.py:588
 msgid "Account {0} does not exist"
 msgstr ""
 
@@ -1562,7 +1572,7 @@ msgstr ""
 msgid "Account {0} doesn't belong to Company {1}"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:544
+#: erpnext/accounts/doctype/account/account.py:545
 msgid "Account {0} exists in parent company {1}."
 msgstr ""
 
@@ -1614,7 +1624,7 @@ msgstr ""
 msgid "Account: {0} is not permitted under Payment Entry"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3285
+#: erpnext/controllers/accounts_controller.py:3280
 msgid "Account: {0} with currency: {1} can not be selected"
 msgstr ""
 
@@ -1899,38 +1909,38 @@ msgstr ""
 msgid "Accounting Entry for Asset"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2066
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2086
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:2143
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:2163
 msgid "Accounting Entry for LCV in Stock Entry {0}"
 msgstr ""
 
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:942
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:939
 msgid "Accounting Entry for Landed Cost Voucher for SCR {0}"
 msgstr ""
 
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:847
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:838
 msgid "Accounting Entry for Service"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1018
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1039
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1057
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1078
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1099
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1127
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1239
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1475
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1497
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1037
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1058
+#: 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:1118
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1146
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1258
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1516
 #: erpnext/controllers/stock_controller.py:733
 #: erpnext/controllers/stock_controller.py:750
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:940
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2011
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2025
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:777
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:931
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:2088
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:2102
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:774
 msgid "Accounting Entry for Stock"
 msgstr ""
 
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:744
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:735
 msgid "Accounting Entry for {0}"
 msgstr ""
 
@@ -2080,6 +2090,12 @@ msgstr ""
 msgid "Accounts Receivable / Payable Tuning"
 msgstr ""
 
+#. Label of the receivable_payable_remarks_length (Int) field in DocType
+#. 'Accounts Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "Accounts Receivable / Payable remarks length"
+msgstr ""
+
 #. Label of the accounts_receivable_credit (Link) field in DocType 'Invoice
 #. Discounting'
 #: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
@@ -2104,12 +2120,6 @@ msgstr ""
 msgid "Accounts Receivable Unpaid Account"
 msgstr ""
 
-#. Label of the receivable_payable_remarks_length (Int) field in DocType
-#. 'Accounts Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Accounts Receivable/Payable"
-msgstr ""
-
 #. Name of a DocType
 #. Label of a Link in the Invoicing Workspace
 #. Label of a shortcut in the ERPNext Settings Workspace
@@ -2129,7 +2139,7 @@ msgstr ""
 msgid "Accounts Setup"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1329
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1333
 msgid "Accounts table cannot be blank."
 msgstr ""
 
@@ -2186,7 +2196,7 @@ msgid "Accumulated Monthly Budget for Account {0} against {1}: {2} is {3}. It wi
 msgstr ""
 
 #: erpnext/accounts/report/balance_sheet/balance_sheet.js:39
-#: erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js:8
+#: erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js:12
 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:40
 msgid "Accumulated Values"
 msgstr ""
@@ -2214,18 +2224,6 @@ msgstr ""
 msgid "Acre (US)"
 msgstr ""
 
-#. Label of the action_if_quality_inspection_is_not_submitted (Select) field in
-#. DocType 'Stock Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Action If Quality Inspection Is Not Submitted"
-msgstr ""
-
-#. Label of the action_if_quality_inspection_is_rejected (Select) field in
-#. DocType 'Stock Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Action If Quality Inspection Is Rejected"
-msgstr ""
-
 #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7
 msgid "Action Initialised"
 msgstr ""
@@ -2278,10 +2276,16 @@ msgstr ""
 msgid "Action if Anual Budget Exceeded on Cumulative Expense"
 msgstr ""
 
-#. Label of the maintain_same_rate_action (Select) field in DocType 'Accounts
-#. Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Action if Same Rate is Not Maintained Throughout  Internal Transaction"
+#. Label of the action_if_quality_inspection_is_not_submitted (Select) field in
+#. DocType 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Action if Quality Inspection is not submitted"
+msgstr ""
+
+#. Label of the action_if_quality_inspection_is_rejected (Select) field in
+#. DocType 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Action if Quality Inspection is rejected"
 msgstr ""
 
 #. Label of the maintain_same_rate_action (Select) field in DocType 'Buying
@@ -2290,6 +2294,12 @@ msgstr ""
 msgid "Action if same rate is not maintained"
 msgstr ""
 
+#. Label of the maintain_same_rate_action (Select) field in DocType 'Accounts
+#. Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "Action if same rate is not maintained throughout internal transaction"
+msgstr ""
+
 #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling
 #. Settings'
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
@@ -2311,7 +2321,7 @@ msgstr ""
 
 #. Label of the enable_serial_and_batch_no_for_item (Check) field in DocType
 #. 'Stock Settings'
-#: erpnext/stock/doctype/item/item.js:407
+#: erpnext/stock/doctype/item/item.js:408
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "Activate Serial / Batch No for Item"
 msgstr ""
@@ -2381,10 +2391,10 @@ msgstr ""
 #: erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json
 #: erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
 #: erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:246
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:250
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:332
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:342
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:230
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:234
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:316
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:326
 msgid "Actual"
 msgstr ""
 
@@ -2435,7 +2445,7 @@ msgstr ""
 msgid "Actual End Date (via Timesheet)"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:230
+#: erpnext/manufacturing/doctype/work_order/work_order.py:299
 msgid "Actual End Date cannot be before Actual Start Date"
 msgstr ""
 
@@ -2445,7 +2455,7 @@ msgstr ""
 msgid "Actual End Time"
 msgstr ""
 
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:471
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:459
 msgid "Actual Expense"
 msgstr ""
 
@@ -2566,7 +2576,6 @@ msgstr ""
 msgid "Ad-hoc Qty"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:670
 #: erpnext/stock/doctype/price_list/price_list.js:8
 msgid "Add / Edit Prices"
 msgstr ""
@@ -2575,11 +2584,6 @@ msgstr ""
 msgid "Add Columns in Transaction Currency"
 msgstr ""
 
-#: erpnext/templates/pages/task_info.html:94
-#: erpnext/templates/pages/task_info.html:96
-msgid "Add Comment"
-msgstr ""
-
 #. Label of the add_corrective_operation_cost_in_finished_good_valuation
 #. (Check) field in DocType 'Manufacturing Settings'
 #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
@@ -2751,7 +2755,7 @@ msgid "Add details"
 msgstr ""
 
 #: erpnext/stock/doctype/pick_list/pick_list.js:89
-#: erpnext/stock/doctype/pick_list/pick_list.py:934
+#: erpnext/stock/doctype/pick_list/pick_list.py:937
 msgid "Add items in the Item Locations table"
 msgstr ""
 
@@ -2804,7 +2808,7 @@ msgstr ""
 msgid "Added Supplier Role to User {0}."
 msgstr ""
 
-#: erpnext/controllers/website_list_for_contact.py:304
+#: erpnext/controllers/website_list_for_contact.py:307
 msgid "Added {1} Role to User {0}."
 msgstr ""
 
@@ -2853,6 +2857,11 @@ msgstr ""
 msgid "Additional Costs"
 msgstr ""
 
+#. Label of the non_stock_items (Table) field in DocType 'Work Order'
+#: erpnext/manufacturing/doctype/work_order/work_order.json
+msgid "Additional Costs (as per BOM)"
+msgstr ""
+
 #. Label of the additional_data (Code) field in DocType 'Common Code'
 #: erpnext/edi/doctype/common_code/common_code.json
 msgid "Additional Data"
@@ -2942,7 +2951,7 @@ msgstr ""
 msgid "Additional Discount Amount (Company Currency)"
 msgstr ""
 
-#: erpnext/controllers/taxes_and_totals.py:833
+#: erpnext/controllers/taxes_and_totals.py:846
 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})"
 msgstr ""
 
@@ -3037,7 +3046,7 @@ msgstr ""
 msgid "Additional Information updated successfully."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:818
+#: erpnext/manufacturing/doctype/work_order/work_order.js:830
 msgid "Additional Material Transfer"
 msgstr ""
 
@@ -3060,7 +3069,7 @@ msgstr ""
 msgid "Additional Transferred Qty"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:711
+#: erpnext/manufacturing/doctype/work_order/work_order.py:775
 msgid ""
 "Additional Transferred Qty {0}\n"
 "\t\t\t\t\tcannot be greater than {1}.\n"
@@ -3074,7 +3083,7 @@ msgstr ""
 msgid "Additional information regarding the customer."
 msgstr ""
 
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:659
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:656
 msgid "Additional {0} {1} of item {2} required as per BOM to complete this transaction"
 msgstr ""
 
@@ -3213,7 +3222,7 @@ msgstr ""
 msgid "Address needs to be linked to a Company. Please add a row for Company in the Links table."
 msgstr ""
 
-#. Description of the 'Determine Address Tax Category From' (Select) field in
+#. Description of the 'Determine Address Tax Category from' (Select) field in
 #. DocType 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 msgid "Address used to determine Tax Category in transactions"
@@ -3223,7 +3232,7 @@ msgstr ""
 msgid "Adjustment Against"
 msgstr ""
 
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:669
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:660
 msgid "Adjustment based on Purchase Invoice rate"
 msgstr ""
 
@@ -3336,7 +3345,7 @@ msgstr ""
 msgid "Advance amount"
 msgstr ""
 
-#: erpnext/controllers/taxes_and_totals.py:970
+#: erpnext/controllers/taxes_and_totals.py:983
 msgid "Advance amount cannot be greater than {0} {1}"
 msgstr ""
 
@@ -3386,7 +3395,7 @@ msgstr ""
 msgid "Aerospace"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_settings/stock_settings.js:20
+#: erpnext/stock/doctype/stock_settings/stock_settings.js:79
 msgid "After save, please refresh the page to apply the changes."
 msgstr ""
 
@@ -3417,7 +3426,7 @@ msgstr ""
 msgid "Against Blanket Order"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1102
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1133
 msgid "Against Customer Order {0}"
 msgstr ""
 
@@ -3481,7 +3490,9 @@ msgstr ""
 msgid "Against Journal Entry {0} is already adjusted against some other voucher"
 msgstr ""
 
+#. Label of the against_pick_list (Link) field in DocType 'Sales Invoice Item'
 #. Label of the against_pick_list (Link) field in DocType 'Delivery Note Item'
+#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
 msgid "Against Pick List"
 msgstr ""
@@ -3514,7 +3525,7 @@ msgstr ""
 msgid "Against Stock Entry"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:332
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:334
 msgid "Against Supplier Invoice {0}"
 msgstr ""
 
@@ -3748,7 +3759,7 @@ msgid "All Item Groups"
 msgstr ""
 
 #: erpnext/selling/page/point_of_sale/pos_item_selector.js:29
-#: erpnext/selling/page/point_of_sale/pos_item_selector.js:247
+#: erpnext/selling/page/point_of_sale/pos_item_selector.js:271
 msgid "All Items"
 msgstr ""
 
@@ -3811,6 +3822,10 @@ msgstr ""
 msgid "All Warehouses"
 msgstr ""
 
+#: erpnext/stock/doctype/item/item_prices.html:72
+msgid "All active prices for this item across buying and selling price lists."
+msgstr ""
+
 #. Description of the 'Reconciled' (Check) field in DocType 'Process Payment
 #. Reconciliation Log'
 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json
@@ -3821,31 +3836,31 @@ msgstr ""
 msgid "All communications including and above this shall be moved into the new Issue"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:972
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:970
 msgid "All items are already requested"
 msgstr ""
 
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1491
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1482
 msgid "All items have already been Invoiced/Returned"
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1231
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1193
 msgid "All items have already been received"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3347
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:3429
 msgid "All items have already been transferred for this Work Order."
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:2956
+#: erpnext/public/js/controllers/transaction.js:2975
 msgid "All items in this document already have a linked Quality Inspection."
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1238
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1269
 msgid "All items must be linked to a Sales Order or Subcontracting Inward Order for this Sales Invoice."
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1249
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1280
 msgid "All linked Sales Orders must be subcontracted."
 msgstr ""
 
@@ -3855,15 +3870,15 @@ msgstr ""
 msgid "All the Comments and Emails will be copied from one document to another newly created document(Lead -> Opportunity -> Quotation) throughout the CRM documents."
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:200
+#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:204
 msgid "All the items have been already returned."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1256
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1268
 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:871
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:833
 msgid "All these items have already been Invoiced/Returned"
 msgstr ""
 
@@ -3975,7 +3990,7 @@ msgstr ""
 
 #. Label of the allow_account_creation_against_child_company (Check) field in
 #. DocType 'Company'
-#: erpnext/accounts/doctype/account/account.py:542
+#: erpnext/accounts/doctype/account/account.py:543
 #: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:68
 #: erpnext/setup/doctype/company/company.json
 msgid "Allow Account Creation Against Child Company"
@@ -4033,13 +4048,7 @@ msgstr ""
 msgid "Allow In Returns"
 msgstr ""
 
-#. Label of the allow_internal_transfer_at_arms_length_price (Check) field in
-#. DocType 'Stock Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Allow Internal Transfers at Arm's Length Price"
-msgstr ""
-
-#: erpnext/controllers/selling_controller.py:859
+#: erpnext/controllers/selling_controller.py:858
 msgid "Allow Item to Be Added Multiple Times in a Transaction"
 msgstr ""
 
@@ -4061,21 +4070,13 @@ msgstr ""
 #. Label of the allow_negative_stock (Check) field in DocType 'Item'
 #. Label of the allow_negative_stock (Check) field in DocType 'Repost Item
 #. Valuation'
-#. Label of the allow_negative_stock (Check) field in DocType 'Stock Settings'
 #: 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:215
 #: erpnext/stock/doctype/stock_settings/stock_settings.py:227
 msgid "Allow Negative Stock"
 msgstr ""
 
-#. Label of the allow_negative_stock_for_batch (Check) field in DocType 'Stock
-#. Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Allow Negative Stock for Batch"
-msgstr ""
-
 #. Label of the allow_or_restrict (Select) field in DocType 'Accounting
 #. Dimension Filter'
 #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json
@@ -4093,12 +4094,6 @@ msgstr ""
 msgid "Allow Partial Payment"
 msgstr ""
 
-#. Label of the allow_partial_reservation (Check) field in DocType 'Stock
-#. Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Allow Partial Reservation"
-msgstr ""
-
 #. Label of the allow_production_on_holidays (Check) field in DocType
 #. 'Manufacturing Settings'
 #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
@@ -4198,7 +4193,7 @@ 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"
+msgid "Allow UOM with conversion rate defined in Item"
 msgstr ""
 
 #. Label of the allow_discount_change (Check) field in DocType 'POS Profile'
@@ -4265,6 +4260,12 @@ msgstr ""
 msgid "Allow existing Serial No to be Manufactured/Received again"
 msgstr ""
 
+#. Label of the allow_internal_transfer_at_arms_length_price (Check) field in
+#. DocType 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Allow internal transfers at user-defined rate"
+msgstr ""
+
 #. Description of the 'Allow Continuous Material Consumption' (Check) field in
 #. DocType 'Manufacturing Settings'
 #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
@@ -4292,6 +4293,23 @@ msgstr ""
 msgid "Allow negative rates for Items"
 msgstr ""
 
+#. Label of the allow_negative_stock (Check) field in DocType 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Allow negative stock"
+msgstr ""
+
+#. Label of the allow_negative_stock_for_batch (Check) field in DocType 'Stock
+#. Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Allow negative stock for Batch"
+msgstr ""
+
+#. Label of the allow_partial_reservation (Check) field in DocType 'Stock
+#. Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Allow partial reservation"
+msgstr ""
+
 #. Description of the 'Zero-Quantity Line Items' (Section Break) field in
 #. DocType 'Selling Settings'
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
@@ -4327,19 +4345,19 @@ msgstr ""
 #. Label of the allow_to_edit_stock_uom_qty_for_purchase (Check) field in
 #. DocType 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Allow to Edit Stock UOM Qty for Purchase Documents"
+msgid "Allow to edit stock UOM qty for Purchase documents"
 msgstr ""
 
 #. Label of the allow_to_edit_stock_uom_qty_for_sales (Check) field in DocType
 #. 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Allow to Edit Stock UOM Qty for Sales Documents"
+msgid "Allow to edit stock UOM qty for Sales documents"
 msgstr ""
 
 #. Label of the allow_to_make_quality_inspection_after_purchase_or_delivery
 #. (Check) field in DocType 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Allow to Make Quality Inspection after Purchase / Delivery"
+msgid "Allow to make Quality Inspection after Purchase / Delivery"
 msgstr ""
 
 #. Description of the 'Allow Excess Material Transfer' (Check) field in DocType
@@ -4356,7 +4374,7 @@ msgstr ""
 #. Label of the repost_allowed_types (Table) field in DocType 'Accounts
 #. Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Allowed Doctypes"
+msgid "Allowed DocTypes"
 msgstr ""
 
 #. Group in Supplier's connections
@@ -4383,7 +4401,7 @@ msgstr ""
 msgid "Allowed special characters are '/' and '-'"
 msgstr ""
 
-#. Description of the 'Enable Stock Reservation' (Check) field in DocType
+#. Description of the 'Enable stock reservation' (Check) field in DocType
 #. 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "Allows to keep aside a specific quantity of inventory for a particular order."
@@ -4407,7 +4425,7 @@ msgstr ""
 msgid "Allows users to submit Supplier Quotations with zero quantity. Useful when rates are fixed but the quantities are not. Eg. Rate Contracts."
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:1083
+#: erpnext/stock/doctype/pick_list/pick_list.py:1086
 msgid "Already Picked"
 msgstr ""
 
@@ -4424,8 +4442,8 @@ msgid "Also you can't switch back to FIFO after setting the valuation method to
 msgstr ""
 
 #: erpnext/manufacturing/doctype/bom/bom.js:288
-#: erpnext/manufacturing/doctype/work_order/work_order.js:146
-#: erpnext/manufacturing/doctype/work_order/work_order.js:161
+#: erpnext/manufacturing/doctype/work_order/work_order.js:158
+#: erpnext/manufacturing/doctype/work_order/work_order.js:173
 #: erpnext/public/js/utils.js:587
 #: erpnext/stock/doctype/stock_entry/stock_entry.js:322
 msgid "Alternate Item"
@@ -4528,6 +4546,7 @@ 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 'Work Order Additional 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'
@@ -4567,7 +4586,7 @@ msgstr ""
 #: erpnext/accounts/doctype/bank_guarantee/bank_guarantee.json
 #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json
 #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json
-#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627
+#: erpnext/accounts/doctype/journal_entry/journal_entry.js:629
 #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
 #: erpnext/accounts/doctype/payment_entry/payment_entry.json
 #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
@@ -4621,8 +4640,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/work_order_additional_item/work_order_additional_item.json
 #: erpnext/manufacturing/doctype/work_order_item/work_order_item.json
-#: erpnext/public/js/controllers/transaction.js:512
+#: erpnext/public/js/controllers/transaction.js:515
 #: erpnext/selling/doctype/quotation/quotation.js:315
 #: erpnext/selling/doctype/quotation_item/quotation_item.json
 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -4822,6 +4842,12 @@ msgstr ""
 msgid "An Item Group is a way to classify items based on types."
 msgstr ""
 
+#. Description of the 'Notify by email on creation of automatic Material
+#. Request' (Check) field in DocType 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "An email will be sent to notify the User with the role 'Purchase Manager' when an automatic Material Request is created."
+msgstr ""
+
 #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:565
 msgid "An error has been appeared while reposting item valuation via {0}"
 msgstr ""
@@ -5212,11 +5238,11 @@ msgstr ""
 msgid "Appointment Duration (In Minutes)"
 msgstr ""
 
-#: erpnext/www/book_appointment/index.py:20
+#: erpnext/www/book_appointment/index.py:23
 msgid "Appointment Scheduling Disabled"
 msgstr ""
 
-#: erpnext/www/book_appointment/index.py:21
+#: erpnext/www/book_appointment/index.py:24
 msgid "Appointment Scheduling has been disabled for this site"
 msgstr ""
 
@@ -5335,7 +5361,7 @@ msgstr ""
 msgid "As there are reserved stock, you cannot disable {0}."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1092
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1090
 msgid "As there are sufficient Sub Assembly Items, Work Order is not required for Warehouse {0}."
 msgstr ""
 
@@ -5799,7 +5825,7 @@ msgstr ""
 msgid "Asset restored after Asset Capitalization {0} was cancelled"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1521
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1552
 msgid "Asset returned"
 msgstr ""
 
@@ -5811,8 +5837,8 @@ msgstr ""
 msgid "Asset scrapped via Journal Entry {0}"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1521
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1524
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1552
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1555
 msgid "Asset sold"
 msgstr ""
 
@@ -5877,7 +5903,7 @@ msgstr ""
 msgid "Asset {0} must be submitted"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:1041
+#: erpnext/controllers/buying_controller.py:1028
 msgid "Asset {assets_link} created for {item_code}"
 msgstr ""
 
@@ -5915,11 +5941,11 @@ msgstr ""
 msgid "Assets Setup"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:1059
+#: erpnext/controllers/buying_controller.py:1046
 msgid "Assets not created for {item_code}. You will have to create asset manually."
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:1046
+#: erpnext/controllers/buying_controller.py:1033
 msgid "Assets {assets_link} created for {item_code}"
 msgstr ""
 
@@ -5943,11 +5969,11 @@ msgstr ""
 msgid "Associate"
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:135
+#: erpnext/stock/doctype/pick_list/pick_list.py:138
 msgid "At Row #{0}: The picked quantity {1} for the item {2} is greater than available stock {3} for the batch {4} in the warehouse {5}. Please restock the item."
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:160
+#: erpnext/stock/doctype/pick_list/pick_list.py:163
 msgid "At Row #{0}: The picked quantity {1} for the item {2} is greater than available stock {3} in the warehouse {4}."
 msgstr ""
 
@@ -5972,7 +5998,7 @@ msgid "At least one item should be entered with negative quantity in return docu
 msgstr ""
 
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:531
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:546
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:561
 msgid "At least one mode of payment is required for POS invoice."
 msgstr ""
 
@@ -5984,7 +6010,7 @@ msgstr ""
 msgid "At least one of the Selling or Buying must be selected"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:324
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:401
 msgid "At least one raw material item must be present in the stock entry for the type {0}"
 msgstr ""
 
@@ -5992,11 +6018,11 @@ msgstr ""
 msgid "At least one row is required for a financial report template"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:883
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:960
 msgid "At least one warehouse is mandatory"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:786
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:863
 msgid "At row #{0}: the Difference Account must not be a Stock type account, please change the Account Type for the account {1} or select a different account"
 msgstr ""
 
@@ -6004,7 +6030,7 @@ msgstr ""
 msgid "At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2}"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:797
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:874
 msgid "At row #{0}: you have selected the Difference Account {1}, which is a Cost of Goods Sold type account. Please select a different account"
 msgstr ""
 
@@ -6171,12 +6197,6 @@ msgstr ""
 msgid "Auto Create Exchange Rate Revaluation"
 msgstr ""
 
-#. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field
-#. in DocType 'Stock Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Auto Create Serial and Batch Bundle For Outward"
-msgstr ""
-
 #. Label of the auto_created (Check) field in DocType 'Fiscal Year'
 #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json
 msgid "Auto Created"
@@ -6204,16 +6224,10 @@ msgstr ""
 msgid "Auto Fetch"
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_item_details.js:225
+#: erpnext/selling/page/point_of_sale/pos_item_details.js:227
 msgid "Auto Fetch Serial Numbers"
 msgstr ""
 
-#. Label of the auto_insert_price_list_rate_if_missing (Check) field in DocType
-#. 'Stock Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Auto Insert Item Price If Missing"
-msgstr ""
-
 #. Label of the auto_material_request (Section Break) field in DocType 'Stock
 #. Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
@@ -6233,24 +6247,18 @@ msgstr ""
 msgid "Auto Reconcile"
 msgstr ""
 
-#. Label of the auto_reconcile_payments (Check) field in DocType 'Accounts
-#. Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Auto Reconcile Payments"
-msgstr ""
-
 #: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:447
 msgid "Auto Reconciliation"
 msgstr ""
 
+#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:395
+msgid "Auto Reconciliation has started in the background"
+msgstr ""
+
 #. Label of the auto_reconciliation_job_trigger (Int) field in DocType
 #. 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Auto Reconciliation Job Trigger"
-msgstr ""
-
-#: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:395
-msgid "Auto Reconciliation has started in the background"
+msgid "Auto Reconciliation job trigger"
 msgstr ""
 
 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py:150
@@ -6264,23 +6272,6 @@ msgstr ""
 msgid "Auto Repeat Detail"
 msgstr ""
 
-#. Label of the auto_reserve_serial_and_batch (Check) field in DocType 'Stock
-#. Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Auto Reserve Serial and Batch Nos"
-msgstr ""
-
-#. Label of the auto_reserve_stock (Check) field in DocType 'Stock Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Auto Reserve Stock"
-msgstr ""
-
-#. Label of the auto_reserve_stock_for_sales_order_on_purchase (Check) field in
-#. DocType 'Stock Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Auto Reserve Stock for Sales Order on Purchase"
-msgstr ""
-
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:198
 msgid "Auto Tax Settings Error"
 msgstr ""
@@ -6301,6 +6292,12 @@ msgstr ""
 msgid "Auto create Purchase Receipt"
 msgstr ""
 
+#. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field
+#. in DocType 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Auto create Serial and Batch Bundle for outward"
+msgstr ""
+
 #. Label of the auto_create_subcontracting_order (Check) field in DocType
 #. 'Buying Settings'
 #: erpnext/buying/doctype/buying_settings/buying_settings.json
@@ -6312,6 +6309,12 @@ msgstr ""
 msgid "Auto create assets on purchase"
 msgstr ""
 
+#. Label of the auto_insert_price_list_rate_if_missing (Check) field in DocType
+#. 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Auto insert Item Price if missing"
+msgstr ""
+
 #. Description of the 'Enable Automatic Party Matching' (Check) field in
 #. DocType 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -6323,11 +6326,34 @@ msgstr ""
 msgid "Auto re-order"
 msgstr ""
 
+#. Label of the auto_reconcile_payments (Check) field in DocType 'Accounts
+#. Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "Auto reconcile Payments"
+msgstr ""
+
 #: erpnext/public/js/controllers/buying.js:377
 #: erpnext/public/js/utils/sales_common.js:484
 msgid "Auto repeat document updated"
 msgstr ""
 
+#. Label of the auto_reserve_serial_and_batch (Check) field in DocType 'Stock
+#. Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Auto reserve Serial and Batch Nos"
+msgstr ""
+
+#. Label of the auto_reserve_stock_for_sales_order_on_purchase (Check) field in
+#. DocType 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Auto reserve Stock for Sales Order on Purchase"
+msgstr ""
+
+#. Label of the auto_reserve_stock (Check) field in DocType 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Auto reserve stock"
+msgstr ""
+
 #. Description of the 'Write Off Limit' (Currency) field in DocType 'POS
 #. Profile'
 #: erpnext/accounts/doctype/pos_profile/pos_profile.json
@@ -6339,33 +6365,27 @@ msgstr ""
 msgid "Automatically Add Filtered Item To Cart"
 msgstr ""
 
-#. Label of the add_taxes_from_item_tax_template (Check) field in DocType
-#. 'Accounts Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Automatically Add Taxes and Charges from Item Tax Template"
-msgstr ""
-
-#. Label of the add_taxes_from_taxes_and_charges_template (Check) field in
-#. DocType 'Accounts Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Automatically Add Taxes from Taxes and Charges Template"
-msgstr ""
-
 #. Label of the create_new_batch (Check) field in DocType 'Item'
 #: erpnext/stock/doctype/item/item.json
 msgid "Automatically Create New Batch"
 msgstr ""
 
+#. Label of the add_taxes_from_item_tax_template (Check) field in DocType
+#. 'Accounts Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "Automatically add Taxes and Charges from Item Tax Template"
+msgstr ""
+
+#. Label of the add_taxes_from_taxes_and_charges_template (Check) field in
+#. DocType 'Accounts Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "Automatically add taxes from Taxes and Charges Template"
+msgstr ""
+
 #. Label of the automatically_fetch_payment_terms (Check) field in DocType
 #. 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Automatically Fetch Payment Terms from Order/Quotation"
-msgstr ""
-
-#. Label of the automatically_process_deferred_accounting_entry (Check) field
-#. in DocType 'Accounts Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Automatically Process Deferred Accounting Entry"
+msgid "Automatically fetch Payment Terms from Order/Quotation"
 msgstr ""
 
 #. Label of the automatically_post_balancing_accounting_entry (Check) field in
@@ -6374,6 +6394,12 @@ msgstr ""
 msgid "Automatically post balancing accounting entry"
 msgstr ""
 
+#. Label of the automatically_process_deferred_accounting_entry (Check) field
+#. in DocType 'Accounts Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "Automatically process deferred Accounting entry"
+msgstr ""
+
 #: erpnext/setup/setup_wizard/data/industry_type.txt:7
 msgid "Automotive"
 msgstr ""
@@ -6517,7 +6543,7 @@ msgstr ""
 msgid "Available for use date is required"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1046
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1123
 msgid "Available quantity is {0}, you need {1}"
 msgstr ""
 
@@ -6639,7 +6665,7 @@ msgstr ""
 #: erpnext/manufacturing/doctype/bom/bom.json
 #: erpnext/manufacturing/doctype/bom/bom_tree.js:8
 #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:197
+#: erpnext/manufacturing/doctype/work_order/work_order.js:209
 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
 #: erpnext/manufacturing/report/bom_explorer/bom_explorer.js:8
 #: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:67
@@ -6896,7 +6922,7 @@ msgstr ""
 msgid "BOM Website Operation"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2458
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:2535
 msgid "BOM and Finished Good Quantity is mandatory for Disassembly"
 msgstr ""
 
@@ -6964,7 +6990,7 @@ msgstr ""
 #. Order Operation'
 #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
 #: erpnext/manufacturing/doctype/job_card/job_card.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:367
+#: erpnext/manufacturing/doctype/work_order/work_order.js:379
 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
 msgid "Backflush Materials From WIP Warehouse"
 msgstr ""
@@ -7603,7 +7629,7 @@ msgstr ""
 msgid "Batch Details"
 msgstr ""
 
-#: erpnext/stock/doctype/batch/batch.py:217
+#: erpnext/stock/doctype/batch/batch.py:216
 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:469
 msgid "Batch Expiry Date"
 msgstr ""
@@ -7613,7 +7639,7 @@ msgstr ""
 msgid "Batch ID"
 msgstr ""
 
-#: erpnext/stock/doctype/batch/batch.py:129
+#: erpnext/stock/doctype/batch/batch.py:128
 msgid "Batch ID is mandatory"
 msgstr ""
 
@@ -7626,6 +7652,12 @@ msgstr ""
 msgid "Batch Item Expiry Status"
 msgstr ""
 
+#. Label of the section_break_gnhq (Section Break) field in DocType 'Stock
+#. Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Batch Item settings"
+msgstr ""
+
 #. Label of the batch_no (Link) field in DocType 'POS Invoice Item'
 #. Label of the batch_no (Link) field in DocType 'Purchase Invoice Item'
 #. Label of the batch_no (Link) field in DocType 'Sales Invoice Item'
@@ -7659,7 +7691,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:2873
+#: erpnext/public/js/controllers/transaction.js:2874
 #: erpnext/public/js/utils/barcode_scanner.js:281
 #: erpnext/public/js/utils/serial_no_batch_selector.js:449
 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -7694,7 +7726,7 @@ msgstr ""
 msgid "Batch No is mandatory"
 msgstr ""
 
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3467
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3448
 msgid "Batch No {0} does not exists"
 msgstr ""
 
@@ -7739,7 +7771,7 @@ msgstr ""
 msgid "Batch Qty updated successfully"
 msgstr ""
 
-#: erpnext/stock/doctype/batch/batch.py:177
+#: erpnext/stock/doctype/batch/batch.py:176
 msgid "Batch Qty updated to {0}"
 msgstr ""
 
@@ -7754,7 +7786,7 @@ msgstr ""
 #. Label of the batch_size (Float) field in DocType 'Work Order Operation'
 #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
 #: erpnext/manufacturing/doctype/operation/operation.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:349
+#: erpnext/manufacturing/doctype/work_order/work_order.js:361
 #: erpnext/manufacturing/doctype/work_order/work_order.json
 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
 msgid "Batch Size"
@@ -7771,7 +7803,7 @@ msgstr ""
 msgid "Batch and Serial No"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:938
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1002
 msgid "Batch not created for item {} since it does not have a batch series."
 msgstr ""
 
@@ -7794,12 +7826,12 @@ msgstr ""
 msgid "Batch {0} is not available in warehouse {1}"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3531
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:3613
 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:290
 msgid "Batch {0} of Item {1} has expired."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3537
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:3619
 msgid "Batch {0} of Item {1} is disabled."
 msgstr ""
 
@@ -7835,7 +7867,7 @@ msgstr ""
 msgid "Beginning of the current subscription period"
 msgstr ""
 
-#: erpnext/accounts/doctype/subscription/subscription.py:323
+#: erpnext/accounts/doctype/subscription/subscription.py:326
 msgid "Below Subscription Plans are of different currency to the party default billing currency/Company currency: {0}"
 msgstr ""
 
@@ -7875,7 +7907,7 @@ msgid "Bill of Materials"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'Timesheet'
-#: erpnext/controllers/website_list_for_contact.py:203
+#: erpnext/controllers/website_list_for_contact.py:206
 #: erpnext/projects/doctype/timesheet/timesheet.json
 #: erpnext/projects/doctype/timesheet/timesheet_list.js:9
 msgid "Billed"
@@ -7922,7 +7954,7 @@ msgstr ""
 msgid "Billed, Received & Returned"
 msgstr ""
 
-#. Option for the 'Determine Address Tax Category From' (Select) field in
+#. Option for the 'Determine Address Tax Category from' (Select) field in
 #. DocType 'Accounts Settings'
 #. Label of the billing_address_display (Text Editor) field in DocType
 #. 'Purchase Invoice'
@@ -8047,7 +8079,7 @@ msgstr ""
 msgid "Billing Interval Count cannot be less than 1"
 msgstr ""
 
-#: erpnext/accounts/doctype/subscription/subscription.py:366
+#: erpnext/accounts/doctype/subscription/subscription.py:375
 msgid "Billing Interval in Subscription Plan must be Month to follow calendar months"
 msgstr ""
 
@@ -8278,29 +8310,29 @@ msgstr ""
 #. Label of the book_asset_depreciation_entry_automatically (Check) field in
 #. DocType 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Book Asset Depreciation Entry Automatically"
+msgid "Book Asset Depreciation entry automatically"
 msgstr ""
 
 #. Label of the book_deferred_entries_based_on (Select) field in DocType
 #. 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Book Deferred Entries Based On"
+msgid "Book Deferred entries based on"
+msgstr ""
+
+#: erpnext/www/book_appointment/index.html:15
+msgid "Book an appointment"
 msgstr ""
 
 #. Label of the book_deferred_entries_via_journal_entry (Check) field in
 #. DocType 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Book Deferred Entries Via Journal Entry"
+msgid "Book deferred entries via Journal Entry"
 msgstr ""
 
 #. Label of the book_tax_discount_loss (Check) field in DocType 'Accounts
 #. Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Book Tax Loss on Early Payment Discount"
-msgstr ""
-
-#: erpnext/www/book_appointment/index.html:15
-msgid "Book an appointment"
+msgid "Book tax loss on early payment discount"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'Shipment'
@@ -8332,7 +8364,7 @@ msgstr ""
 msgid "Both Receivable Account: {0} and Advance Account: {1} must be of same currency for company: {2}"
 msgstr ""
 
-#: erpnext/accounts/doctype/subscription/subscription.py:342
+#: erpnext/accounts/doctype/subscription/subscription.py:345
 msgid "Both Trial Period Start Date and Trial Period End Date must be set"
 msgstr ""
 
@@ -8451,11 +8483,11 @@ msgstr ""
 #: erpnext/accounts/doctype/cost_center/cost_center_tree.js:65
 #: erpnext/accounts/doctype/cost_center/cost_center_tree.js:73
 #: erpnext/accounts/doctype/cost_center/cost_center_tree.js:81
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:245
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:249
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:331
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:341
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:466
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:229
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:233
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:315
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:325
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:454
 #: erpnext/accounts/workspace/invoicing/invoicing.json
 #: erpnext/desktop_icon/budget.json erpnext/workspace_sidebar/budget.json
 msgid "Budget"
@@ -8555,7 +8587,7 @@ msgstr ""
 msgid "Buffer Time"
 msgstr ""
 
-#. Option for the 'Data Fetch Method' (Select) field in DocType 'Accounts
+#. Option for the 'Data fetch method' (Select) field in DocType 'Accounts
 #. Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 msgid "Buffered Cursor"
@@ -8631,6 +8663,10 @@ msgstr ""
 msgid "Buy"
 msgstr ""
 
+#: erpnext/stock/doctype/item/item_prices.html:96
+msgid "Buy & Sell"
+msgstr ""
+
 #. Description of a DocType
 #: erpnext/selling/doctype/customer/customer.json
 msgid "Buyer of Goods and Services."
@@ -8656,6 +8692,7 @@ msgstr ""
 #: erpnext/buying/workspace/buying/buying.json erpnext/desktop_icon/buying.json
 #: erpnext/setup/doctype/incoterm/incoterm.json
 #: erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
+#: erpnext/stock/doctype/item/item_prices.html:98
 #: erpnext/stock/doctype/item_price/item_price.json
 #: erpnext/stock/doctype/price_list/price_list.json
 #: erpnext/workspace_sidebar/buying.json
@@ -9032,7 +9069,7 @@ msgstr ""
 msgid "Can be approved by {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2579
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2643
 msgid "Can not close Work Order. Since {0} Job Cards are in Work In Progress state."
 msgstr ""
 
@@ -9060,13 +9097,13 @@ msgstr ""
 msgid "Can not filter based on Voucher No, if grouped by Voucher"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1388
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1392
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2873
 msgid "Can only make payment against unbilled {0}"
 msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1501
-#: erpnext/controllers/accounts_controller.py:3194
+#: erpnext/controllers/accounts_controller.py:3189
 #: erpnext/public/js/controllers/accounts.js:103
 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'"
 msgstr ""
@@ -9171,7 +9208,7 @@ msgstr ""
 msgid "Cannot cancel as processing of cancelled documents is pending."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1116
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1180
 msgid "Cannot cancel because submitted Stock Entry {0} exists"
 msgstr ""
 
@@ -9187,11 +9224,11 @@ msgstr ""
 msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment <b>{0}</b>. Please cancel the Asset Value Adjustment to continue."
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:1148
+#: erpnext/controllers/buying_controller.py:1135
 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:561
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:638
 msgid "Cannot cancel transaction for Completed Work Order."
 msgstr ""
 
@@ -9235,12 +9272,12 @@ msgstr ""
 msgid "Cannot covert to Group because Account Type is selected."
 msgstr ""
 
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1021
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1012
 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts."
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:1914
-#: erpnext/stock/doctype/pick_list/pick_list.py:255
+#: erpnext/selling/doctype/sales_order/sales_order.py:1915
+#: erpnext/stock/doctype/pick_list/pick_list.py:258
 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list."
 msgstr ""
 
@@ -9265,7 +9302,7 @@ msgstr ""
 msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'"
 msgstr ""
 
-#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1816
+#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1845
 msgid "Cannot delete Exchange Gain/Loss row"
 msgstr ""
 
@@ -9273,7 +9310,7 @@ msgstr ""
 msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3799
+#: erpnext/controllers/accounts_controller.py:3804
 msgid "Cannot delete an item which has been ordered"
 msgstr ""
 
@@ -9298,11 +9335,11 @@ msgstr ""
 msgid "Cannot disable {0} as it may lead to incorrect stock valuation."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:728
+#: erpnext/manufacturing/doctype/work_order/work_order.py:792
 msgid "Cannot disassemble more than produced quantity."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:926
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1003
 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble."
 msgstr ""
 
@@ -9327,7 +9364,7 @@ msgstr ""
 msgid "Cannot find Item with this Barcode"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3751
+#: erpnext/controllers/accounts_controller.py:3756
 msgid "Cannot find a default warehouse for item {0}. Please set one in the Item Master or in Stock Settings."
 msgstr ""
 
@@ -9335,15 +9372,15 @@ msgstr ""
 msgid "Cannot merge {0} '{1}' into '{2}' as both have existing accounting entries in different currencies for company '{3}'."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:578
+#: erpnext/manufacturing/doctype/work_order/work_order.py:642
 msgid "Cannot produce more Item {0} than Sales Order quantity {1} {2}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1473
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1537
 msgid "Cannot produce more item for {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1477
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1541
 msgid "Cannot produce more than {0} items for {1}"
 msgstr ""
 
@@ -9351,12 +9388,12 @@ msgstr ""
 msgid "Cannot receive from customer against negative outstanding"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3947
+#: erpnext/controllers/accounts_controller.py:3952
 msgid "Cannot reduce quantity than ordered or purchased quantity"
 msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1514
-#: erpnext/controllers/accounts_controller.py:3209
+#: erpnext/controllers/accounts_controller.py:3204
 #: erpnext/public/js/controllers/accounts.js:120
 msgid "Cannot refer row number greater than or equal to current row number for this Charge type"
 msgstr ""
@@ -9376,9 +9413,9 @@ msgstr ""
 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1507
 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1685
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827
-#: erpnext/controllers/accounts_controller.py:3199
+#: erpnext/controllers/accounts_controller.py:3194
 #: erpnext/public/js/controllers/accounts.js:112
-#: erpnext/public/js/controllers/taxes_and_totals.js:550
+#: erpnext/public/js/controllers/taxes_and_totals.js:552
 msgid "Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"
 msgstr ""
 
@@ -9394,11 +9431,11 @@ msgstr ""
 msgid "Cannot set multiple Item Defaults for a company."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3913
+#: erpnext/controllers/accounts_controller.py:3918
 msgid "Cannot set quantity less than delivered quantity."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3914
+#: erpnext/controllers/accounts_controller.py:3919
 msgid "Cannot set quantity less than received quantity."
 msgstr ""
 
@@ -9410,7 +9447,7 @@ msgstr ""
 msgid "Cannot start deletion. Another deletion {0} is already queued/running. Please wait for it to complete."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3941
+#: erpnext/controllers/accounts_controller.py:3946
 msgid "Cannot update rate as item {0} is already ordered or purchased against this quotation"
 msgstr ""
 
@@ -9443,7 +9480,7 @@ msgstr ""
 msgid "Capacity Planning"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1102
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1166
 msgid "Capacity Planning Error, planned start time can not be same as end time"
 msgstr ""
 
@@ -9591,7 +9628,7 @@ msgstr ""
 msgid "Cash In Hand"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:322
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:324
 msgid "Cash or Bank Account is mandatory for making payment entry"
 msgstr ""
 
@@ -9686,7 +9723,7 @@ msgid "Category-wise Asset Value"
 msgstr ""
 
 #: erpnext/buying/doctype/purchase_order/purchase_order.py:300
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:143
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:144
 msgid "Caution"
 msgstr ""
 
@@ -9790,7 +9827,7 @@ msgstr ""
 msgid "Change in Stock Value"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1028
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1059
 msgid "Change the account type to Receivable or select a different account."
 msgstr ""
 
@@ -9808,10 +9845,16 @@ msgstr ""
 msgid "Changes in {0}"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:373
+#: erpnext/stock/doctype/item/item.js:374
 msgid "Changing Customer Group for the selected Customer is not allowed."
 msgstr ""
 
+#. Description of the 'column_break_mfor' (Column Break) field in DocType
+#. 'Accounts Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "Changing the account in any transaction of the DocTypes listed below will trigger a repost. To prevent reposting, remove the relevant DocType from the list."
+msgstr ""
+
 #: erpnext/stock/doctype/item/item.js:16
 msgid "Changing the valuation method to Moving Average will affect new transactions. If backdated entries are added, earlier FIFO-based entries will be reposted, which may change closing balances."
 msgstr ""
@@ -9823,7 +9866,7 @@ msgid "Channel Partner"
 msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2256
-#: erpnext/controllers/accounts_controller.py:3262
+#: erpnext/controllers/accounts_controller.py:3257
 msgid "Charge of type 'Actual' in row {0} cannot be included in Item Rate or Paid Amount"
 msgstr ""
 
@@ -9846,12 +9889,6 @@ msgstr ""
 msgid "Charges will be distributed proportionately based on item qty or amount, as per your selection"
 msgstr ""
 
-#. Label of the chart_of_accounts_section (Section Break) field in DocType
-#. 'Accounts Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Chart Of Accounts"
-msgstr ""
-
 #. Label of the chart_of_accounts (Select) field in DocType 'Company'
 #: erpnext/setup/doctype/company/company.json
 msgid "Chart Of Accounts Template"
@@ -9868,12 +9905,15 @@ msgstr ""
 msgid "Chart Tree"
 msgstr ""
 
+#. Label of the chart_of_accounts_section (Section Break) field in DocType
+#. 'Accounts Settings'
 #. Label of a Link in the Invoicing Workspace
 #. Label of the section_break_28 (Section Break) field in DocType 'Company'
 #. Label of a Link in the Home Workspace
 #. Label of a Workspace Sidebar Item
 #: erpnext/accounts/doctype/account/account.js:87
 #: erpnext/accounts/doctype/account/account_tree.js:5
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 #: erpnext/accounts/doctype/cost_center/cost_center_tree.js:52
 #: erpnext/accounts/workspace/invoicing/invoicing.json
 #: erpnext/public/js/setup_wizard.js:43
@@ -9920,7 +9960,7 @@ msgstr ""
 #. Label of the check_supplier_invoice_uniqueness (Check) field in DocType
 #. 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Check Supplier Invoice Number Uniqueness"
+msgid "Check Supplier invoice number uniqueness"
 msgstr ""
 
 #. Description of the 'Is Container' (Check) field in DocType 'Location'
@@ -10016,7 +10056,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:2784
+#: erpnext/public/js/controllers/transaction.js:2785
 msgid "Cheque/Reference Date"
 msgstr ""
 
@@ -10069,7 +10109,7 @@ msgstr ""
 
 #. Label of the child_row_reference (Data) field in DocType 'Quality
 #. Inspection'
-#: erpnext/public/js/controllers/transaction.js:2879
+#: erpnext/public/js/controllers/transaction.js:2880
 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json
 msgid "Child Row Reference"
 msgstr ""
@@ -10175,7 +10215,7 @@ msgstr ""
 msgid "Clearing Demo Data..."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.js:719
+#: erpnext/manufacturing/doctype/production_plan/production_plan.js:720
 msgid "Click on 'Get Finished Goods for Manufacture' to fetch the items from the above Sales Orders. Items only for which a BOM is present will be fetched."
 msgstr ""
 
@@ -10183,7 +10223,7 @@ msgstr ""
 msgid "Click on Add to Holidays. This will populate the holidays table with all the dates that fall on the selected weekly off. Repeat the process for populating the dates for all your weekly holidays"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.js:714
+#: erpnext/manufacturing/doctype/production_plan/production_plan.js:715
 msgid "Click on Get Sales Orders to fetch sales orders based on the above filters."
 msgstr ""
 
@@ -10237,7 +10277,7 @@ msgstr ""
 msgid "Closed Documents"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2502
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2566
 msgid "Closed Work Order can not be stopped or Re-opened"
 msgstr ""
 
@@ -10727,7 +10767,7 @@ msgstr ""
 #: erpnext/accounts/report/balance_sheet/balance_sheet.html:128
 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:8
 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:7
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:72
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:43
 #: erpnext/accounts/report/cash_flow/cash_flow.html:128
 #: erpnext/accounts/report/cheques_and_deposits_incorrectly_cleared/cheques_and_deposits_incorrectly_cleared.js:8
 #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:8
@@ -11022,11 +11062,11 @@ msgstr ""
 msgid "Company Address Name"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4379
+#: erpnext/controllers/accounts_controller.py:4384
 msgid "Company Address is missing. You don't have permission to create an Address. Please contact your System Manager."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4367
+#: erpnext/controllers/accounts_controller.py:4372
 msgid "Company Address is missing. You don't have permission to update it. Please contact your System Manager."
 msgstr ""
 
@@ -11125,7 +11165,7 @@ msgstr ""
 msgid "Company and Posting Date is mandatory"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2580
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2620
 msgid "Company currencies of both the companies should match for Inter Company Transactions."
 msgstr ""
 
@@ -11142,7 +11182,7 @@ msgstr ""
 msgid "Company is mandatory for company account"
 msgstr ""
 
-#: erpnext/accounts/doctype/subscription/subscription.py:395
+#: erpnext/accounts/doctype/subscription/subscription.py:404
 msgid "Company is mandatory for generating an invoice. Please set a default company in Global Defaults."
 msgstr ""
 
@@ -11281,7 +11321,7 @@ msgstr ""
 msgid "Completed Qty"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1391
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1455
 msgid "Completed Qty cannot be greater than 'Qty to Manufacture'"
 msgstr ""
 
@@ -11403,8 +11443,11 @@ msgstr ""
 
 #. Label of the configure (Button) field in DocType 'Buying Settings'
 #. Label of the configure (Button) field in DocType 'Selling Settings'
+#. Label of the configure (Button) field in DocType 'Stock Settings'
+#. Label of the configure_series (Button) field in DocType 'Stock Settings'
 #: erpnext/buying/doctype/buying_settings/buying_settings.json
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "Configure Series"
 msgstr ""
 
@@ -11444,7 +11487,7 @@ msgstr ""
 msgid "Consider Minimum Order Qty"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1078
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1090
 msgid "Consider Process Loss"
 msgstr ""
 
@@ -11539,7 +11582,7 @@ msgstr ""
 #. Log'
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
 #: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:559
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:574
 msgid "Consolidated Sales Invoice"
 msgstr ""
 
@@ -11641,7 +11684,7 @@ msgstr ""
 msgid "Consumed Qty"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1770
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1834
 msgid "Consumed Qty cannot be greater than Reserved Qty for item {0}"
 msgstr ""
 
@@ -11988,22 +12031,22 @@ msgstr ""
 msgid "Conversion factor for item {0} has been reset to 1.0 as the uom {1} is same as stock uom {2}."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2977
+#: erpnext/controllers/accounts_controller.py:2972
 msgid "Conversion rate cannot be 0"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2984
+#: erpnext/controllers/accounts_controller.py:2979
 msgid "Conversion rate is 1.00, but document currency is different from company currency"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2980
+#: erpnext/controllers/accounts_controller.py:2975
 msgid "Conversion rate must be 1.00 if document currency is same as company currency"
 msgstr ""
 
 #. Label of the clean_description_html (Check) field in DocType 'Stock
 #. Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Convert Item Description to Clean HTML in Transactions"
+msgid "Convert Item description to clean HTML in transactions"
 msgstr ""
 
 #: erpnext/accounts/doctype/account/account.js:124
@@ -12331,8 +12374,8 @@ 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:1440
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:906
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1459
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:897
 msgid "Cost Center is required in row {0} in Taxes table for type {1}"
 msgstr ""
 
@@ -12414,7 +12457,7 @@ msgstr ""
 msgid "Cost of Goods Sold"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:800
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:877
 msgid "Cost of Goods Sold Account in Items Table"
 msgstr ""
 
@@ -12497,7 +12540,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:693
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:655
 msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
 msgstr ""
 
@@ -12682,7 +12725,7 @@ msgstr ""
 msgid "Create Item"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:187
+#: erpnext/manufacturing/doctype/work_order/work_order.js:199
 msgid "Create Job Card"
 msgstr ""
 
@@ -12773,11 +12816,11 @@ msgstr ""
 msgid "Create Payment Entry for Consolidated POS Invoices."
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:519
+#: erpnext/public/js/controllers/transaction.js:522
 msgid "Create Payment Request"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:800
+#: erpnext/manufacturing/doctype/work_order/work_order.js:812
 msgid "Create Pick List"
 msgstr ""
 
@@ -12960,12 +13003,12 @@ msgstr ""
 msgid "Create Users"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:968
+#: erpnext/stock/doctype/item/item.js:1011
 msgid "Create Variant"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:779
-#: erpnext/stock/doctype/item/item.js:823
+#: erpnext/stock/doctype/item/item.js:816
+#: erpnext/stock/doctype/item/item.js:860
 msgid "Create Variants"
 msgstr ""
 
@@ -12984,8 +13027,8 @@ msgstr ""
 msgid "Create Workstation"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:806
-#: erpnext/stock/doctype/item/item.js:961
+#: erpnext/stock/doctype/item/item.js:843
+#: erpnext/stock/doctype/item/item.js:1004
 msgid "Create a variant with the template image."
 msgstr ""
 
@@ -13005,7 +13048,7 @@ msgstr ""
 #. Label of the create_pr_in_draft_status (Check) field in DocType 'Accounts
 #. Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Create in Draft Status"
+msgid "Create payment requests in Draft status"
 msgstr ""
 
 #. Label of an action in the Onboarding Step 'Create Supplier'
@@ -13076,18 +13119,21 @@ msgstr ""
 msgid "Creating Purchase Order ..."
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:710
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:729
 #: erpnext/buying/doctype/purchase_order/purchase_order.js:506
 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:74
 msgid "Creating Purchase Receipt ..."
 msgstr ""
 
+#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:604
+msgid "Creating Return of Components ..."
+msgstr ""
+
 #: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:59
 msgid "Creating Sales Invoices ..."
 msgstr ""
 
 #: erpnext/buying/doctype/purchase_order/purchase_order.js:111
-#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:598
 msgid "Creating Stock Entry"
 msgstr ""
 
@@ -13099,7 +13145,7 @@ msgstr ""
 msgid "Creating Subcontracting Order ..."
 msgstr ""
 
-#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:698
+#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:693
 msgid "Creating Subcontracting Receipt ..."
 msgstr ""
 
@@ -13164,7 +13210,7 @@ msgstr ""
 msgid "Credit ({0})"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641
+#: erpnext/accounts/doctype/journal_entry/journal_entry.js:643
 msgid "Credit Account"
 msgstr ""
 
@@ -13245,12 +13291,6 @@ msgstr ""
 msgid "Credit Limit Crossed"
 msgstr ""
 
-#. Label of the accounts_transactions_settings_section (Section Break) field in
-#. DocType 'Accounts Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Credit Limit Settings"
-msgstr ""
-
 #. Label of the credit_limit_section (Section Break) field in DocType
 #. 'Customer'
 #: erpnext/selling/doctype/customer/customer.json
@@ -13316,14 +13356,14 @@ 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:690
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:652
 msgid "Credit Note {0} has been created automatically"
 msgstr ""
 
 #. Label of the credit_to (Link) field in DocType 'Purchase Invoice'
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:376
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:384
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:378
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:386
 #: erpnext/controllers/accounts_controller.py:2376
 msgid "Credit To"
 msgstr ""
@@ -13852,7 +13892,7 @@ msgstr ""
 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16
 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.py:64
 #: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.js:7
-#: erpnext/selling/report/inactive_customers/inactive_customers.py:74
+#: erpnext/selling/report/inactive_customers/inactive_customers.py:77
 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.js:47
 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:72
 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:37
@@ -14105,7 +14145,7 @@ msgstr ""
 #: erpnext/selling/doctype/party_specific_item/party_specific_item.json
 #: erpnext/selling/doctype/quotation/quotation.json
 #: erpnext/selling/doctype/sales_order/sales_order.json
-#: erpnext/selling/report/inactive_customers/inactive_customers.py:77
+#: erpnext/selling/report/inactive_customers/inactive_customers.py:80
 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:80
 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:30
 #: erpnext/selling/workspace/selling/selling.json
@@ -14215,7 +14255,7 @@ msgstr ""
 #: erpnext/selling/doctype/sales_order/sales_order.json
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.py:74
-#: erpnext/selling/report/inactive_customers/inactive_customers.py:75
+#: erpnext/selling/report/inactive_customers/inactive_customers.py:78
 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:78
 #: erpnext/stock/doctype/delivery_note/delivery_note.json
 #: erpnext/stock/doctype/item_customer_detail/item_customer_detail.json
@@ -14339,7 +14379,7 @@ msgstr ""
 msgid "Customer Warehouse {0} does not belong to Customer {1}."
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_item_cart.js:994
+#: erpnext/selling/page/point_of_sale/pos_item_cart.js:1006
 msgid "Customer contact updated successfully."
 msgstr ""
 
@@ -14361,9 +14401,9 @@ msgstr ""
 msgid "Customer required for 'Customerwise Discount'"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1142
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1173
 #: erpnext/selling/doctype/sales_order/sales_order.py:436
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:437
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:406
 msgid "Customer {0} does not belong to project {1}"
 msgstr ""
 
@@ -14506,12 +14546,6 @@ msgstr ""
 msgid "Data Based On"
 msgstr ""
 
-#. Label of the receivable_payable_fetch_method (Select) field in DocType
-#. 'Accounts Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Data Fetch Method"
-msgstr ""
-
 #. Label of the data_import_configuration_section (Section Break) field in
 #. DocType 'Bank'
 #: erpnext/accounts/doctype/bank/bank.json
@@ -14528,6 +14562,12 @@ msgstr ""
 msgid "Data Source"
 msgstr ""
 
+#. Label of the receivable_payable_fetch_method (Select) field in DocType
+#. 'Accounts Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "Data fetch method"
+msgstr ""
+
 #. Label of the date (Date) field in DocType 'Bulk Transaction Log Detail'
 #: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
 msgid "Date "
@@ -14663,7 +14703,7 @@ msgstr ""
 msgid "Day(s) after the end of the invoice month"
 msgstr ""
 
-#. Option for the 'Book Deferred Entries Based On' (Select) field in DocType
+#. Option for the 'Book Deferred entries based on' (Select) field in DocType
 #. 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 msgid "Days"
@@ -14671,7 +14711,7 @@ msgstr ""
 
 #: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:51
 #: erpnext/selling/report/inactive_customers/inactive_customers.js:8
-#: erpnext/selling/report/inactive_customers/inactive_customers.py:83
+#: erpnext/selling/report/inactive_customers/inactive_customers.py:86
 msgid "Days Since Last Order"
 msgstr ""
 
@@ -14740,7 +14780,7 @@ msgstr ""
 msgid "Debit / Credit Note Posting Date"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631
+#: erpnext/accounts/doctype/journal_entry/journal_entry.js:633
 msgid "Debit Account"
 msgstr ""
 
@@ -14810,13 +14850,13 @@ msgstr ""
 #. Label of the debit_to (Link) field in DocType 'Sales Invoice'
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1013
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1024
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1044
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1055
 #: erpnext/controllers/accounts_controller.py:2376
 msgid "Debit To"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1009
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1040
 msgid "Debit To is required"
 msgstr ""
 
@@ -14986,15 +15026,15 @@ msgstr ""
 msgid "Default BOM ({0}) must be active for this item or its template"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2270
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2334
 msgid "Default BOM for {0} not found"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3985
+#: erpnext/controllers/accounts_controller.py:3990
 msgid "Default BOM not found for FG Item {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2267
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2331
 msgid "Default BOM not found for Item {0} and Project {1}"
 msgstr ""
 
@@ -15539,7 +15579,7 @@ msgstr ""
 #. Label of the delete_linked_ledger_entries (Check) field in DocType 'Accounts
 #. Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Delete Accounting and Stock Ledger Entries on deletion of Transaction"
+msgid "Delete Accounting and Stock Ledger entries on deletion of transaction"
 msgstr ""
 
 #. Label of the delete_bin_data_status (Select) field in DocType 'Transaction
@@ -15631,7 +15671,7 @@ msgstr ""
 #. Order'
 #: erpnext/buying/doctype/purchase_order/purchase_order.json
 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:20
-#: erpnext/controllers/website_list_for_contact.py:209
+#: erpnext/controllers/website_list_for_contact.py:212
 #: erpnext/stock/doctype/serial_no/serial_no.json
 #: erpnext/stock/doctype/shipment/shipment.json
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
@@ -15702,11 +15742,11 @@ msgstr ""
 msgid "Delivered Qty (in Stock UOM)"
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:623
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:611
 msgid "Delivered Qty cannot be increased by more than {0} for item {1}"
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:616
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:604
 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}"
 msgstr ""
 
@@ -15805,6 +15845,7 @@ msgstr ""
 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:59
 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json
 #: erpnext/stock/doctype/shipment_delivery_note/shipment_delivery_note.json
+#: erpnext/stock/doctype/stock_settings/stock_settings.js:152
 #: erpnext/stock/workspace/stock/stock.json
 #: erpnext/workspace_sidebar/stock.json
 msgid "Delivery Note"
@@ -15847,7 +15888,7 @@ msgstr ""
 msgid "Delivery Note Trends"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1403
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1434
 msgid "Delivery Note {0} is not submitted"
 msgstr ""
 
@@ -16210,7 +16251,7 @@ msgstr ""
 #. Label of the determine_address_tax_category_from (Select) field in DocType
 #. 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Determine Address Tax Category From"
+msgid "Determine Address Tax Category from"
 msgstr ""
 
 #. Option for the 'Fuel Type' (Select) field in DocType 'Vehicle'
@@ -16256,11 +16297,11 @@ msgstr ""
 msgid "Difference Account"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:789
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:866
 msgid "Difference Account in Items Table"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:778
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:855
 msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry"
 msgstr ""
 
@@ -16462,7 +16503,7 @@ msgstr ""
 #. Label of the disable_serial_no_and_batch_selector (Check) field in DocType
 #. 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Disable Serial No And Batch Selector"
+msgid "Disable Serial No and Batch selector"
 msgstr ""
 
 #. Label of the disable_transaction_threshold (Check) field in DocType 'Tax
@@ -16516,7 +16557,7 @@ msgstr ""
 
 #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry'
 #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type'
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1056
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1068
 #: erpnext/stock/doctype/stock_entry/stock_entry.js:370
 #: erpnext/stock/doctype/stock_entry/stock_entry.js:413
 #: erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -16524,15 +16565,15 @@ msgstr ""
 msgid "Disassemble"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:213
+#: erpnext/manufacturing/doctype/work_order/work_order.js:225
 msgid "Disassemble Order"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2400
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:2477
 msgid "Disassemble Qty cannot be less than or equal to 0."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:445
+#: erpnext/manufacturing/doctype/work_order/work_order.js:457
 msgid "Disassemble Qty cannot be less than or equal to <b>0</b>."
 msgstr ""
 
@@ -16565,12 +16606,12 @@ msgstr ""
 #: erpnext/accounts/doctype/payment_term/payment_term.json
 #: erpnext/accounts/doctype/payment_terms_template_detail/payment_terms_template_detail.json
 #: erpnext/selling/page/point_of_sale/pos_item_cart.js:406
-#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:147
+#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:151
 #: erpnext/templates/form_grid/item_grid.html:71
 msgid "Discount"
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_item_details.js:175
+#: erpnext/selling/page/point_of_sale/pos_item_details.js:177
 msgid "Discount (%)"
 msgstr ""
 
@@ -16735,7 +16776,7 @@ msgstr ""
 msgid "Discount and Margin"
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_item_cart.js:824
+#: erpnext/selling/page/point_of_sale/pos_item_cart.js:835
 msgid "Discount cannot be greater than 100%"
 msgstr ""
 
@@ -16890,6 +16931,12 @@ msgstr ""
 msgid "Dispatch Settings"
 msgstr ""
 
+#. Label of the display_data_formatting_section (Section Break) field in
+#. DocType 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Display & Data Formatting"
+msgstr ""
+
 #. Label of the display_name (Data) field in DocType 'Financial Report Row'
 #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json
 msgid "Display Name"
@@ -17037,18 +17084,6 @@ msgstr ""
 msgid "Do Not Explode"
 msgstr ""
 
-#. Label of the do_not_update_serial_batch_on_creation_of_auto_bundle (Check)
-#. field in DocType 'Stock Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Do Not Update Serial / Batch on Creation of Auto Bundle"
-msgstr ""
-
-#. Label of the do_not_use_batchwise_valuation (Check) field in DocType 'Stock
-#. Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Do Not Use Batch-wise Valuation"
-msgstr ""
-
 #: erpnext/stock/doctype/stock_settings/stock_settings.py:128
 msgid "Do Not Use Batchwise Valuation"
 msgstr ""
@@ -17065,21 +17100,33 @@ msgstr ""
 msgid "Do not show any symbol like $ etc next to currencies."
 msgstr ""
 
+#. Label of the do_not_update_serial_batch_on_creation_of_auto_bundle (Check)
+#. field in DocType 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Do not update Serial / Batch on creation of auto bundle"
+msgstr ""
+
 #. Label of the do_not_update_variants (Check) field in DocType 'Item Variant
 #. Settings'
 #: erpnext/stock/doctype/item_variant_settings/item_variant_settings.json
 msgid "Do not update variants on save"
 msgstr ""
 
+#. Label of the do_not_use_batchwise_valuation (Check) field in DocType 'Stock
+#. Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Do not use Batch-wise Valuation"
+msgstr ""
+
 #: erpnext/assets/doctype/asset/asset.js:956
 msgid "Do you really want to restore this scrapped asset?"
 msgstr ""
 
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.js:23
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.js:26
 msgid "Do you still want to enable immutable ledger?"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_settings/stock_settings.js:50
+#: erpnext/stock/doctype/stock_settings/stock_settings.js:109
 msgid "Do you still want to enable negative inventory?"
 msgstr ""
 
@@ -17143,13 +17190,19 @@ msgstr ""
 msgid "Document Count"
 msgstr ""
 
+#. Label of the document_naming_tab (Tab Break) field in DocType 'Accounts
+#. Settings'
 #. Label of the document_naming_tab (Tab Break) field in DocType 'Buying
 #. Settings'
 #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling
 #. Settings'
+#. Label of the document_naming_tab (Tab Break) field in DocType 'Stock
+#. Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 #: erpnext/buying/doctype/buying_settings/buying_settings.json
 #: erpnext/public/js/utils/naming_series.js:7
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "Document Naming"
 msgstr ""
 
@@ -17170,7 +17223,7 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-#. Description of the 'Reconciliation Queue Size' (Int) field in DocType
+#. Description of the 'Reconciliation queue size' (Int) field in DocType
 #. 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100"
@@ -17637,7 +17690,7 @@ msgstr ""
 msgid "Edit Posting Date and Time"
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:286
+#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:290
 msgid "Edit Receipt"
 msgstr ""
 
@@ -17656,7 +17709,7 @@ msgstr ""
 msgid "Edit Tax Withholding Entries"
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_item_cart.js:777
+#: erpnext/selling/page/point_of_sale/pos_item_cart.js:788
 msgid "Editing {0} is not allowed as per POS Profile settings"
 msgstr ""
 
@@ -17790,7 +17843,7 @@ msgstr ""
 msgid "Email Receipt"
 msgstr ""
 
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:374
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:383
 msgid "Email Sent to Supplier {0}"
 msgstr ""
 
@@ -17806,7 +17859,7 @@ msgstr ""
 msgid "Email or Phone/Mobile of the Contact are mandatory to continue."
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:322
+#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:326
 msgid "Email sent successfully."
 msgstr ""
 
@@ -18026,6 +18079,10 @@ msgstr ""
 msgid "Ems(Pica)"
 msgstr ""
 
+#: erpnext/public/js/controllers/transaction.js:2947
+msgid "Enable <b>{0}</b> on the Item master to proceed with {1} inspection."
+msgstr ""
+
 #. Label of the enable_accounting_dimensions (Check) field in DocType 'Accounts
 #. Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -18158,12 +18215,6 @@ msgstr ""
 msgid "Enable Serial / Batch Bundle"
 msgstr ""
 
-#. Label of the enable_stock_reservation (Check) field in DocType 'Stock
-#. Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Enable Stock Reservation"
-msgstr ""
-
 #. Label of the enable_subscription (Check) field in DocType 'Accounts
 #. Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -18244,11 +18295,23 @@ msgstr ""
 msgid "Enable it if users want to consider rejected materials to dispatch."
 msgstr ""
 
+#. Label of the enable_stock_reservation (Check) field in DocType 'Stock
+#. Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Enable stock reservation"
+msgstr ""
+
 #. Description of the 'Has Priority' (Check) field in DocType 'Pricing Rule'
 #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
 msgid "Enable this checkbox even if you want to set the zero priority"
 msgstr ""
 
+#. Description of the 'Use legacy Budget Controller' (Check) field in DocType
+#. 'Accounts Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "Enable this if you are experiencing issues with the new budget controller. Uses the older budget validation logic"
+msgstr ""
+
 #. Description of the 'Calculate daily depreciation using total days in
 #. depreciation period' (Check) field in DocType 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -18294,7 +18357,7 @@ msgstr ""
 msgid "Enabling this checkbox will force each Job Card Time Log to have From Time and To Time"
 msgstr ""
 
-#. Description of the 'Check Supplier Invoice Number Uniqueness' (Check) field
+#. Description of the 'Check Supplier invoice number uniqueness' (Check) field
 #. in DocType 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 msgid "Enabling this ensures each Purchase Invoice has a unique value in Supplier Invoice No. field within a particular fiscal year"
@@ -18312,7 +18375,7 @@ msgstr ""
 msgid "Enabling this will allow creation of multi-currency invoices against single party account in company currency"
 msgstr ""
 
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.js:19
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.js:22
 msgid "Enabling this will change the way how cancelled transactions are handled."
 msgstr ""
 
@@ -18457,15 +18520,15 @@ msgstr ""
 msgid "Enter amount to be redeemed."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:1130
+#: erpnext/stock/doctype/item/item.js:1173
 msgid "Enter an Item Code, the name will be auto-filled the same as Item Code on clicking inside the Item Name field."
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_item_cart.js:942
+#: erpnext/selling/page/point_of_sale/pos_item_cart.js:953
 msgid "Enter customer's email"
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_item_cart.js:948
+#: erpnext/selling/page/point_of_sale/pos_item_cart.js:959
 msgid "Enter customer's phone number"
 msgstr ""
 
@@ -18509,7 +18572,7 @@ msgstr ""
 msgid "Enter the name of the bank or lending institution before submitting."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:1156
+#: erpnext/stock/doctype/item/item.js:1199
 msgid "Enter the opening stock units."
 msgstr ""
 
@@ -18517,7 +18580,7 @@ msgstr ""
 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:1218
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1230
 msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
 msgstr ""
 
@@ -18691,7 +18754,7 @@ msgstr ""
 msgid "Exception Budget Approver Role"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:933
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1010
 msgid "Excess Disassembly"
 msgstr ""
 
@@ -18973,7 +19036,7 @@ msgstr ""
 #: erpnext/projects/doctype/task/task.json
 #: erpnext/projects/report/delayed_tasks_summary/delayed_tasks_summary.py:126
 #: erpnext/projects/web_form/tasks/tasks.json
-#: erpnext/templates/pages/task_info.html:64
+#: erpnext/templates/pages/task_info.html:55
 msgid "Expected End Date"
 msgstr ""
 
@@ -18997,7 +19060,7 @@ msgstr ""
 #: erpnext/projects/doctype/task/task.json
 #: erpnext/projects/report/delayed_tasks_summary/delayed_tasks_summary.py:120
 #: erpnext/projects/web_form/tasks/tasks.json
-#: erpnext/templates/pages/task_info.html:59
+#: erpnext/templates/pages/task_info.html:50
 msgid "Expected Start Date"
 msgstr ""
 
@@ -19035,7 +19098,7 @@ msgstr ""
 #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json
 #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json
 #: erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:602
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:596
 #: erpnext/accounts/report/account_balance/account_balance.js:28
 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:89
 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:184
@@ -19106,13 +19169,13 @@ msgstr ""
 msgid "Expense Head"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:496
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:520
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:540
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:490
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:514
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:534
 msgid "Expense Head Changed"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:598
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:592
 msgid "Expense account is mandatory for item {0}"
 msgstr ""
 
@@ -19142,7 +19205,7 @@ msgstr ""
 msgid "Expenses Included In Valuation"
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:307
+#: erpnext/stock/doctype/pick_list/pick_list.py:310
 #: erpnext/stock/doctype/stock_entry/stock_entry.js:496
 msgid "Expired Batches"
 msgstr ""
@@ -19177,7 +19240,7 @@ msgstr ""
 msgid "Expiry Date"
 msgstr ""
 
-#: erpnext/stock/doctype/batch/batch.py:219
+#: erpnext/stock/doctype/batch/batch.py:218
 msgid "Expiry Date Mandatory"
 msgstr ""
 
@@ -19413,7 +19476,7 @@ msgstr ""
 #. Label of the fetch_payment_schedule_in_payment_request (Check) field in
 #. DocType 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Fetch Payment Schedule In Payment Request"
+msgid "Fetch Payment Schedule in Payment Request"
 msgstr ""
 
 #: erpnext/accounts/doctype/subscription/subscription.js:36
@@ -19430,12 +19493,6 @@ msgstr ""
 msgid "Fetch Timesheet in Sales Invoice"
 msgstr ""
 
-#. Label of the fetch_valuation_rate_for_internal_transaction (Check) field in
-#. DocType 'Accounts Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Fetch Valuation Rate for Internal Transaction"
-msgstr ""
-
 #. Label of the fetch_from_parent (Select) field in DocType 'Inventory
 #. Dimension'
 #: erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
@@ -19447,7 +19504,13 @@ msgstr ""
 msgid "Fetch exploded BOM (including sub-assemblies)"
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_item_details.js:455
+#. Label of the fetch_valuation_rate_for_internal_transaction (Check) field in
+#. DocType 'Accounts Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "Fetch valuation rate for internal Transaction"
+msgstr ""
+
+#: erpnext/selling/page/point_of_sale/pos_item_details.js:457
 msgid "Fetched only {0} available serial numbers."
 msgstr ""
 
@@ -19460,7 +19523,7 @@ msgid "Fetching Sales Orders..."
 msgstr ""
 
 #: erpnext/accounts/doctype/dunning/dunning.js:135
-#: erpnext/public/js/controllers/transaction.js:1594
+#: erpnext/public/js/controllers/transaction.js:1595
 msgid "Fetching exchange rates ..."
 msgstr ""
 
@@ -19703,15 +19766,15 @@ msgstr ""
 msgid "Financial Year Begins On"
 msgstr ""
 
-#. Description of the 'Ignore Account Closing Balance' (Check) field in DocType
+#. Description of the 'Ignore Account closing balance' (Check) field in DocType
 #. 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 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:884
-#: erpnext/manufacturing/doctype/work_order/work_order.js:899
-#: erpnext/manufacturing/doctype/work_order/work_order.js:908
+#: erpnext/manufacturing/doctype/work_order/work_order.js:896
+#: erpnext/manufacturing/doctype/work_order/work_order.js:911
+#: erpnext/manufacturing/doctype/work_order/work_order.js:920
 msgid "Finish"
 msgstr ""
 
@@ -19768,15 +19831,15 @@ msgstr ""
 msgid "Finished Good Item Quantity"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3971
+#: erpnext/controllers/accounts_controller.py:3976
 msgid "Finished Good Item is not specified for service item {0}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3988
+#: erpnext/controllers/accounts_controller.py:3993
 msgid "Finished Good Item {0} Qty can not be zero"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3982
+#: erpnext/controllers/accounts_controller.py:3987
 msgid "Finished Good Item {0} must be a sub-contracted item"
 msgstr ""
 
@@ -19863,7 +19926,7 @@ msgstr ""
 msgid "Finished Goods based Operating Cost"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1777
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1854
 msgid "Finished Item {0} does not match with Work Order {1}"
 msgstr ""
 
@@ -20094,11 +20157,11 @@ msgstr ""
 msgid "Fluid Ounce (US)"
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_item_selector.js:384
+#: erpnext/selling/page/point_of_sale/pos_item_selector.js:408
 msgid "Focus on Item Group filter"
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_item_selector.js:375
+#: erpnext/selling/page/point_of_sale/pos_item_selector.js:399
 msgid "Focus on search input"
 msgstr ""
 
@@ -20204,7 +20267,7 @@ msgstr ""
 msgid "For Production"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:900
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:977
 msgid "For Quantity (Manufactured Qty) is mandatory"
 msgstr ""
 
@@ -20290,7 +20353,7 @@ msgstr ""
 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:2649
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2713
 msgid "For operation {0}: Quantity ({1}) can not be greater than pending quantity({2})"
 msgstr ""
 
@@ -20307,7 +20370,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:1809
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1886
 msgid "For quantity {0} should not be greater than allowed quantity {1}"
 msgstr ""
 
@@ -20321,7 +20384,7 @@ msgstr ""
 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1723
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1721
 msgid "For row {0}: Enter Planned Qty"
 msgstr ""
 
@@ -20340,11 +20403,11 @@ msgstr ""
 msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1148
 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}."
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:1404
+#: erpnext/public/js/controllers/transaction.js:1405
 msgctxt "Clear payment terms template and/or payment schedule when due date is changed"
 msgid "For the new {0} to take effect, would you like to clear the current {1}?"
 msgstr ""
@@ -20458,7 +20521,7 @@ msgstr ""
 
 #. Label of the stock_frozen_upto_days (Int) field in DocType 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Freeze Stocks Older Than (Days)"
+msgid "Freeze stocks older than (days)"
 msgstr ""
 
 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:107
@@ -20612,7 +20675,7 @@ msgstr ""
 
 #. Label of the from_fiscal_year (Link) field in DocType 'Budget'
 #: erpnext/accounts/doctype/budget/budget.json
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:43
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:51
 msgid "From Fiscal Year"
 msgstr ""
 
@@ -21047,15 +21110,12 @@ msgstr ""
 msgid "Gauss"
 msgstr ""
 
-#. Label of the general_ledger_remarks_length (Int) field in DocType 'Accounts
-#. Settings'
 #. Option for the 'Report' (Select) field in DocType 'Process Statement Of
 #. Accounts'
 #. Name of a report
 #. Label of a Link in the Financial Reports Workspace
 #. Label of a Workspace Sidebar Item
 #: erpnext/accounts/doctype/account/account.js:110
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
 #: erpnext/accounts/report/general_ledger/general_ledger.json
 #: erpnext/accounts/workspace/financial_reports/financial_reports.json
@@ -21070,6 +21130,12 @@ msgctxt "Warehouse"
 msgid "General Ledger"
 msgstr ""
 
+#. Label of the general_ledger_remarks_length (Int) field in DocType 'Accounts
+#. Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "General Ledger remarks length"
+msgstr ""
+
 #. Label of the gs (Section Break) field in DocType 'Item Group'
 #: erpnext/setup/doctype/item_group/item_group.json
 msgid "General Settings"
@@ -21439,15 +21505,15 @@ msgid "Goods"
 msgstr ""
 
 #: erpnext/setup/doctype/company/company.py:387
-#: erpnext/stock/doctype/stock_entry/stock_entry_list.js:21
+#: erpnext/stock/doctype/stock_entry/stock_entry_list.js:34
 msgid "Goods In Transit"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry_list.js:23
+#: erpnext/stock/doctype/stock_entry/stock_entry_list.js:36
 msgid "Goods Transferred"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2327
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:2404
 msgid "Goods are already received against the outward entry {0}"
 msgstr ""
 
@@ -21582,9 +21648,9 @@ msgstr ""
 #: erpnext/selling/doctype/quotation/quotation.json
 #: erpnext/selling/doctype/sales_order/sales_order.json
 #: erpnext/selling/page/point_of_sale/pos_item_cart.js:105
-#: erpnext/selling/page/point_of_sale/pos_item_cart.js:548
-#: erpnext/selling/page/point_of_sale/pos_item_cart.js:552
-#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:181
+#: erpnext/selling/page/point_of_sale/pos_item_cart.js:554
+#: erpnext/selling/page/point_of_sale/pos_item_cart.js:558
+#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:185
 #: erpnext/selling/page/point_of_sale/pos_payment.js:692
 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json
 #: erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -21858,7 +21924,7 @@ msgstr ""
 
 #. Option for the 'Distribution Frequency' (Select) field in DocType 'Budget'
 #: erpnext/accounts/doctype/budget/budget.json
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:64
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:72
 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:77
 #: erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:59
 #: erpnext/public/js/financial_statements.js:443
@@ -21998,7 +22064,7 @@ msgstr ""
 
 #. Label of the use_naming_series (Check) field in DocType 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Have Default Naming Series for Batch ID?"
+msgid "Have default Naming Series for Batch ID?"
 msgstr ""
 
 #: erpnext/setup/setup_wizard/data/designation.txt:19
@@ -22390,7 +22456,7 @@ msgstr ""
 msgid "Idle"
 msgstr ""
 
-#. Description of the 'Book Deferred Entries Based On' (Select) field in
+#. Description of the 'Book Deferred entries based on' (Select) field in
 #. DocType 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 msgid "If \"Months\" is selected, a fixed amount will be booked as deferred revenue or expense for each month irrespective of the number of days in a month. It will be prorated if deferred revenue or expense is not booked for an entire month"
@@ -22508,7 +22574,7 @@ msgstr ""
 msgid "If enabled, all files attached to this document will be attached to each email"
 msgstr ""
 
-#. Description of the 'Do Not Update Serial / Batch on Creation of Auto Bundle'
+#. Description of the 'Do not update Serial / Batch on creation of auto bundle'
 #. (Check) field in DocType 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid ""
@@ -22567,25 +22633,25 @@ msgstr ""
 msgid "If enabled, the consolidated invoices will have rounded total disabled"
 msgstr ""
 
-#. Description of the 'Allow Internal Transfers at Arm's Length Price' (Check)
+#. Description of the 'Allow internal transfers at user-defined rate' (Check)
 #. field in DocType 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "If enabled, the item rate won't adjust to the valuation rate during internal transfers, but accounting will still use the valuation rate. This will allow the user to specify a different rate for printing or taxation purposes."
 msgstr ""
 
-#. Description of the 'Validate Material Transfer Warehouses' (Check) field in
+#. Description of the 'Validate Material Transfer warehouses' (Check) field in
 #. DocType 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "If enabled, the source and target warehouse in the Material Transfer Stock Entry must be different else an error will be thrown. If inventory dimensions are present, same source and target warehouse can be allowed but atleast any one of the inventory dimension fields must be different."
 msgstr ""
 
-#. Description of the 'Allow Negative Stock for Batch' (Check) field in DocType
+#. Description of the 'Allow negative stock for Batch' (Check) field in DocType
 #. 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "If enabled, the system will allow negative stock entries for the batch. But, this may lead to incorrect valuation rates, so it is recommended to avoid using this option. The system will permit negative stock only when it is caused by backdated entries and will validate and block negative stock in all other cases."
 msgstr ""
 
-#. Description of the 'Allow UOM with Conversion Rate Defined in Item' (Check)
+#. 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."
@@ -22609,7 +22675,7 @@ msgstr ""
 msgid "If enabled, the system will use the inventory account set in the Item Master or Item Group or Brand. Otherwise, it will use the inventory account set in the Warehouse."
 msgstr ""
 
-#. Description of the 'Do Not Use Batch-wise Valuation' (Check) field in
+#. Description of the 'Do not use Batch-wise Valuation' (Check) field in
 #. DocType 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "If enabled, the system will use the moving average valuation method to calculate the valuation rate for the batched items and will not consider the individual batch-wise incoming rate."
@@ -22633,6 +22699,12 @@ msgstr ""
 msgid "If enabled, user will be alerted before resetting posting date to current date in relevant transactions"
 msgstr ""
 
+#. Description of the 'Disable Serial No and Batch selector' (Check) field in
+#. DocType 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "If enabled, users must enter Serial No. / Batch data manually instead of using the selector dialog."
+msgstr ""
+
 #. Description of the 'Variant Of' (Link) field in DocType 'Item'
 #: erpnext/stock/doctype/item/item.json
 msgid "If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified"
@@ -22644,7 +22716,7 @@ msgstr ""
 msgid "If items in stock, proceed with Material Transfer or Purchase."
 msgstr ""
 
-#. Description of the 'Role Allowed to Create/Edit Back-dated Transactions'
+#. Description of the 'Role allowed to create/edit back-dated transactions'
 #. (Link) field in DocType 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "If mentioned, the system will allow only the users with this Role to create or modify any stock transaction earlier than the latest stock transaction for a specific item and warehouse. If set as blank, it allows all users to create/edit back-dated transactions."
@@ -22665,7 +22737,7 @@ msgstr ""
 msgid "If no Item Price is found for an item in the Price List set in the transaction, prices from the Default Price List will be fetched."
 msgstr ""
 
-#. Description of the 'Automatically Add Taxes from Taxes and Charges Template'
+#. Description of the 'Automatically add taxes from Taxes and Charges Template'
 #. (Check) field in DocType 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 msgid "If no taxes are set, and Taxes and Charges Template is selected, the system will automatically apply the taxes from the chosen template."
@@ -22699,7 +22771,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:1251
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1263
 msgid "If the BOM results in Scrap material, the Scrap Warehouse needs to be selected."
 msgstr ""
 
@@ -22718,7 +22790,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:1270
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1282
 msgid "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed."
 msgstr ""
 
@@ -22744,13 +22816,13 @@ msgstr ""
 msgid "If this is checked subsequent new invoices will be created on calendar  month and quarter start dates irrespective of current invoice start date"
 msgstr ""
 
-#. Description of the 'Submit Journal Entries' (Check) field in DocType
+#. Description of the 'Submit Journal entries' (Check) field in DocType
 #. 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 msgid "If this is unchecked Journal Entries will be saved in a Draft state and will have to be submitted manually"
 msgstr ""
 
-#. Description of the 'Book Deferred Entries Via Journal Entry' (Check) field
+#. Description of the 'Book deferred entries via Journal Entry' (Check) field
 #. in DocType 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 msgid "If this is unchecked, direct GL entries will be created to book deferred revenue or expense"
@@ -22795,7 +22867,7 @@ msgstr ""
 msgid "If yes, then this warehouse will be used to store rejected materials"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:1142
+#: erpnext/stock/doctype/item/item.js:1185
 msgid "If you are maintaining stock of this Item in your Inventory, ERPNext will make a stock ledger entry for each transaction of this item."
 msgstr ""
 
@@ -22805,8 +22877,8 @@ msgstr ""
 msgid "If you need to reconcile particular transactions against each other, then please select accordingly. If not, all the transactions will be allocated in FIFO order."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1097
-msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox."
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1095
+msgid "If you still want to proceed, please disable '{0}' checkbox."
 msgstr ""
 
 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:1841
@@ -22849,7 +22921,7 @@ msgstr ""
 #. Label of the ignore_account_closing_balance (Check) field in DocType
 #. 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Ignore Account Closing Balance"
+msgid "Ignore Account closing balance"
 msgstr ""
 
 #: erpnext/stock/report/stock_balance/stock_balance.js:125
@@ -22889,10 +22961,6 @@ msgstr ""
 msgid "Ignore Existing Ordered Qty"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1833
-msgid "Ignore Existing Projected Quantity"
-msgstr ""
-
 #. Label of the ignore_is_opening_check_for_reporting (Check) field in DocType
 #. 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -23047,7 +23115,7 @@ msgstr ""
 msgid "Import completed. {0} common codes created."
 msgstr ""
 
-#: erpnext/stock/doctype/item_price/item_price.js:29
+#: erpnext/stock/doctype/item_price/item_price.js:38
 msgid "Import in Bulk"
 msgstr ""
 
@@ -23126,6 +23194,7 @@ msgstr ""
 #: erpnext/stock/doctype/delivery_trip/delivery_trip.json
 #: erpnext/stock/doctype/material_request/material_request.json
 #: erpnext/stock/doctype/material_request/material_request_list.js:11
+#: erpnext/stock/doctype/stock_entry/stock_entry_list.js:28
 msgid "In Transit"
 msgstr ""
 
@@ -23232,7 +23301,7 @@ msgstr ""
 msgid "In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:1175
+#: erpnext/stock/doctype/item/item.js:1218
 msgid "In this section, you can define Company-wide transaction-related defaults for this Item. Eg. Default Warehouse, Default Price List, Supplier, etc."
 msgstr ""
 
@@ -23471,7 +23540,7 @@ msgstr ""
 #: erpnext/accounts/doctype/account_category/account_category.json
 #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json
 #: erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:440
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:454
 #: erpnext/accounts/report/account_balance/account_balance.js:27
 #: erpnext/accounts/report/financial_statements.py:773
 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:182
@@ -23553,7 +23622,7 @@ msgstr ""
 msgid "Incoming call from {0}"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_settings/stock_settings.js:74
+#: erpnext/stock/doctype/stock_settings/stock_settings.js:133
 msgid "Incompatible Setting Detected"
 msgstr ""
 
@@ -23566,7 +23635,7 @@ msgstr ""
 msgid "Incorrect Balance Qty After Transaction"
 msgstr ""
 
-#: erpnext/controllers/subcontracting_controller.py:1071
+#: erpnext/controllers/subcontracting_controller.py:1072
 msgid "Incorrect Batch Consumed"
 msgstr ""
 
@@ -23578,7 +23647,7 @@ msgstr ""
 msgid "Incorrect Company"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1155
 msgid "Incorrect Component Quantity"
 msgstr ""
 
@@ -23604,7 +23673,7 @@ msgstr ""
 msgid "Incorrect Serial No Valuation"
 msgstr ""
 
-#: erpnext/controllers/subcontracting_controller.py:1084
+#: erpnext/controllers/subcontracting_controller.py:1085
 msgid "Incorrect Serial Number Consumed"
 msgstr ""
 
@@ -23622,8 +23691,8 @@ msgstr ""
 msgid "Incorrect Type of Transaction"
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:187
-#: erpnext/stock/doctype/pick_list/pick_list.py:211
+#: erpnext/stock/doctype/pick_list/pick_list.py:190
+#: erpnext/stock/doctype/pick_list/pick_list.py:214
 #: erpnext/stock/doctype/stock_settings/stock_settings.py:159
 msgid "Incorrect Warehouse"
 msgstr ""
@@ -23835,7 +23904,7 @@ msgstr ""
 msgid "Installation Note Item"
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:644
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:606
 msgid "Installation Note {0} has already been submitted"
 msgstr ""
 
@@ -23874,19 +23943,19 @@ msgstr ""
 msgid "Insufficient Capacity"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3865
-#: erpnext/controllers/accounts_controller.py:3889
-#: erpnext/controllers/accounts_controller.py:4409
-#: erpnext/controllers/accounts_controller.py:4415
-#: erpnext/controllers/accounts_controller.py:4437
+#: erpnext/controllers/accounts_controller.py:3870
+#: erpnext/controllers/accounts_controller.py:3894
+#: erpnext/controllers/accounts_controller.py:4414
+#: erpnext/controllers/accounts_controller.py:4420
+#: erpnext/controllers/accounts_controller.py:4442
 msgid "Insufficient Permissions"
 msgstr ""
 
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:463
-#: erpnext/stock/doctype/pick_list/pick_list.py:145
-#: erpnext/stock/doctype/pick_list/pick_list.py:163
-#: erpnext/stock/doctype/pick_list/pick_list.py:1090
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1050
+#: erpnext/stock/doctype/pick_list/pick_list.py:148
+#: erpnext/stock/doctype/pick_list/pick_list.py:166
+#: erpnext/stock/doctype/pick_list/pick_list.py:1093
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127
 #: erpnext/stock/serial_batch_bundle.py:1225 erpnext/stock/stock_ledger.py:1713
 #: erpnext/stock/stock_ledger.py:2191
 msgid "Insufficient Stock"
@@ -24098,6 +24167,12 @@ msgstr ""
 msgid "Internal Transfer Reference Missing"
 msgstr ""
 
+#. Label of the internal_transfer_rules_section (Section Break) field in
+#. DocType 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Internal Transfer Rules"
+msgstr ""
+
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py:37
 msgid "Internal Transfers"
 msgstr ""
@@ -24115,24 +24190,24 @@ msgstr ""
 msgid "Internet Publishing"
 msgstr ""
 
-#. Description of the 'Auto Reconciliation Job Trigger' (Int) field in DocType
+#. Description of the 'Auto Reconciliation job trigger' (Int) field in DocType
 #. 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 msgid "Interval should be between 1 to 59 MInutes"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:377
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:385
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1019
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1029
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:379
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:387
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1050
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1060
 #: erpnext/assets/doctype/asset_category/asset_category.py:69
 #: erpnext/assets/doctype/asset_category/asset_category.py:97
-#: erpnext/controllers/accounts_controller.py:3223
-#: erpnext/controllers/accounts_controller.py:3231
+#: erpnext/controllers/accounts_controller.py:3218
+#: erpnext/controllers/accounts_controller.py:3226
 msgid "Invalid Account"
 msgstr ""
 
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:418
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:406
 msgid "Invalid Accounting Dimension"
 msgstr ""
 
@@ -24157,7 +24232,7 @@ msgstr ""
 msgid "Invalid Barcode. There is no Item attached to this barcode."
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:3140
+#: erpnext/public/js/controllers/transaction.js:3159
 msgid "Invalid Blanket Order for the selected Customer and Item"
 msgstr ""
 
@@ -24173,13 +24248,13 @@ msgstr ""
 msgid "Invalid Company Field"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2355
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2395
 msgid "Invalid Company for Inter Company Transaction."
 msgstr ""
 
 #: erpnext/assets/doctype/asset/asset.py:361
 #: erpnext/assets/doctype/asset/asset.py:368
-#: erpnext/controllers/accounts_controller.py:3246
+#: erpnext/controllers/accounts_controller.py:3241
 msgid "Invalid Cost Center"
 msgstr ""
 
@@ -24195,7 +24270,7 @@ msgstr ""
 msgid "Invalid Discount"
 msgstr ""
 
-#: erpnext/controllers/taxes_and_totals.py:840
+#: erpnext/controllers/taxes_and_totals.py:853
 msgid "Invalid Discount Amount"
 msgstr ""
 
@@ -24207,6 +24282,10 @@ msgstr ""
 msgid "Invalid Document Type"
 msgstr ""
 
+#: erpnext/selling/report/sales_analytics/sales_analytics.py:529
+msgid "Invalid Document Type {0}"
+msgstr ""
+
 #: erpnext/stock/doctype/quality_inspection/quality_inspection.py:325
 #: erpnext/stock/doctype/quality_inspection/quality_inspection.py:330
 msgid "Invalid Formula"
@@ -24217,7 +24296,7 @@ msgid "Invalid Group By"
 msgstr ""
 
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:500
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:960
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:958
 msgid "Invalid Item"
 msgstr ""
 
@@ -24277,8 +24356,8 @@ msgstr ""
 msgid "Invalid Purchase Invoice"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3909
-#: erpnext/controllers/accounts_controller.py:3923
+#: erpnext/controllers/accounts_controller.py:3914
+#: erpnext/controllers/accounts_controller.py:3928
 msgid "Invalid Qty"
 msgstr ""
 
@@ -24290,7 +24369,7 @@ msgstr ""
 msgid "Invalid Query"
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:198
+#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:202
 msgid "Invalid Return"
 msgstr ""
 
@@ -24303,19 +24382,23 @@ msgstr ""
 msgid "Invalid Schedule"
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:310
+#: erpnext/controllers/selling_controller.py:311
 msgid "Invalid Selling Price"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1852
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1929
 msgid "Invalid Serial and Batch Bundle"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1112
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1134
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1189
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1211
 msgid "Invalid Source and Target Warehouse"
 msgstr ""
 
+#: erpnext/selling/report/sales_analytics/sales_analytics.py:507
+msgid "Invalid Tree Type {0}"
+msgstr ""
+
 #: erpnext/edi/doctype/code_list/code_list_import.py:37
 msgid "Invalid Upload"
 msgstr ""
@@ -24369,6 +24452,14 @@ msgstr ""
 msgid "Invalid search query"
 msgstr ""
 
+#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:98
+msgid "Invalid value {0} for 'Based On'"
+msgstr ""
+
+#: erpnext/selling/report/inactive_customers/inactive_customers.py:18
+msgid "Invalid value {0} for 'Doctype'"
+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:871
@@ -24380,7 +24471,7 @@ msgstr ""
 msgid "Invalid {0}"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2353
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2393
 msgid "Invalid {0} for Inter Company Transaction."
 msgstr ""
 
@@ -24450,7 +24541,7 @@ msgstr ""
 msgid "Invite Users"
 msgstr ""
 
-#. Option for the 'Posting Date Inheritance for Exchange Gain / Loss' (Select)
+#. Option for the 'Posting Date inheritance for exchange gain / loss' (Select)
 #. field in DocType 'Accounts Settings'
 #. Label of the sales_invoice (Link) field in DocType 'Discounted Invoice'
 #. Label of the invoice (Dynamic Link) field in DocType 'Loyalty Point Entry'
@@ -24610,7 +24701,7 @@ msgstr ""
 #: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
 #: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2404
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2444
 #: erpnext/buying/doctype/supplier/supplier.json
 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
 msgid "Invoices"
@@ -25287,7 +25378,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:2541
+#: erpnext/public/js/controllers/transaction.js:2542
 msgid "It is needed to fetch Item Details."
 msgstr ""
 
@@ -25345,7 +25436,7 @@ msgstr ""
 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33
 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:204
 #: erpnext/buying/workspace/buying/buying.json
-#: erpnext/controllers/taxes_and_totals.py:1249
+#: erpnext/controllers/taxes_and_totals.py:1262
 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json
 #: erpnext/manufacturing/doctype/bom/bom.js:1085
 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109
@@ -25378,6 +25469,7 @@ msgstr ""
 #: erpnext/stock/doctype/pick_list_item/pick_list_item.json
 #: erpnext/stock/doctype/putaway_rule/putaway_rule.json
 #: erpnext/stock/doctype/putaway_rule/putaway_rule.py:323
+#: erpnext/stock/doctype/stock_settings/stock_settings.js:149
 #: erpnext/stock/page/stock_balance/stock_balance.js:23
 #: erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:36
 #: erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:7
@@ -25545,6 +25637,7 @@ msgstr ""
 #. Label of the item_code (Link) field in DocType 'Production Plan'
 #. Label of the item_code (Link) field in DocType 'Production Plan Item'
 #. Label of the item_code (Link) field in DocType 'Sales Forecast Item'
+#. Label of the item_code (Link) field in DocType 'Work Order Additional Item'
 #. Label of the item_code (Link) field in DocType 'Work Order Item'
 #. Label of the item_code (Link) field in DocType 'Import Supplier Invoice'
 #. Label of the item_code (Link) field in DocType 'Delivery Schedule Item'
@@ -25636,6 +25729,7 @@ msgstr ""
 #: erpnext/manufacturing/doctype/production_plan/production_plan.json
 #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
 #: erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.json
+#: erpnext/manufacturing/doctype/work_order_additional_item/work_order_additional_item.json
 #: erpnext/manufacturing/doctype/work_order_item/work_order_item.json
 #: erpnext/manufacturing/doctype/workstation/workstation.js:471
 #: erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:159
@@ -25653,7 +25747,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:214
-#: erpnext/public/js/controllers/transaction.js:2835
+#: erpnext/public/js/controllers/transaction.js:2836
 #: erpnext/public/js/stock_reservation.js:112
 #: erpnext/public/js/stock_reservation.js:318 erpnext/public/js/utils.js:579
 #: erpnext/public/js/utils.js:736
@@ -25748,12 +25842,12 @@ msgstr ""
 msgid "Item Code cannot be changed for Serial No."
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:452
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:446
 msgid "Item Code required at Row No {0}"
 msgstr ""
 
 #: erpnext/selling/page/point_of_sale/pos_controller.js:825
-#: erpnext/selling/page/point_of_sale/pos_item_details.js:275
+#: erpnext/selling/page/point_of_sale/pos_item_details.js:277
 msgid "Item Code: {0} is not available under warehouse {1}."
 msgstr ""
 
@@ -25881,7 +25975,7 @@ msgstr ""
 #: erpnext/selling/doctype/party_specific_item/party_specific_item.json
 #: erpnext/selling/doctype/quotation_item/quotation_item.json
 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json
-#: erpnext/selling/page/point_of_sale/pos_item_selector.js:212
+#: erpnext/selling/page/point_of_sale/pos_item_selector.js:236
 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.js:30
 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:35
 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:54
@@ -26137,7 +26231,7 @@ msgstr ""
 #: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:371
 #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:92
 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:138
-#: erpnext/public/js/controllers/transaction.js:2841
+#: erpnext/public/js/controllers/transaction.js:2842
 #: erpnext/public/js/utils.js:831
 #: erpnext/selling/doctype/quotation_item/quotation_item.json
 #: erpnext/selling/doctype/sales_order/sales_order.js:1286
@@ -26232,8 +26326,8 @@ msgstr ""
 msgid "Item Price Stock"
 msgstr ""
 
-#: erpnext/stock/get_item_details.py:1132
-#: erpnext/stock/get_item_details.py:1156
+#: erpnext/stock/get_item_details.py:1143
+#: erpnext/stock/get_item_details.py:1167
 msgid "Item Price added for {0} in Price List - {1}"
 msgstr ""
 
@@ -26245,12 +26339,14 @@ msgstr ""
 msgid "Item Price created at rate {0}"
 msgstr ""
 
-#: erpnext/stock/get_item_details.py:1115
+#: erpnext/stock/get_item_details.py:1126
 msgid "Item Price updated for {0} in Price List {1}"
 msgstr ""
 
+#. Label of the item_prices_column (Column Break) field in DocType 'Item'
 #. Name of a report
 #. Label of a Link in the Stock Workspace
+#: erpnext/stock/doctype/item/item.json
 #: erpnext/stock/report/item_prices/item_prices.json
 #: erpnext/stock/workspace/stock/stock.json
 msgid "Item Prices"
@@ -26432,7 +26528,7 @@ msgstr ""
 msgid "Item Variant Settings"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:991
+#: erpnext/stock/doctype/item/item.js:1034
 msgid "Item Variant {0} already exists with same attributes"
 msgstr ""
 
@@ -26517,7 +26613,7 @@ msgstr ""
 msgid "Item Wise Tax Details"
 msgstr ""
 
-#: erpnext/controllers/taxes_and_totals.py:556
+#: erpnext/controllers/taxes_and_totals.py:560
 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:"
 msgstr ""
 
@@ -26537,7 +26633,7 @@ msgstr ""
 msgid "Item and Warranty Details"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:3592
 msgid "Item for row {0} does not match Material Request"
 msgstr ""
 
@@ -26567,11 +26663,11 @@ msgstr ""
 msgid "Item operation"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3963
+#: erpnext/controllers/accounts_controller.py:3968
 msgid "Item qty can not be updated as raw materials are already processed."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1249
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1326
 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}"
 msgstr ""
 
@@ -26594,7 +26690,7 @@ msgstr ""
 msgid "Item variant {0} exists with same attributes"
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:590
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:578
 msgid "Item with name {0} not found in the Purchase Order"
 msgstr ""
 
@@ -26623,7 +26719,7 @@ msgstr ""
 msgid "Item {0} does not exist."
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:856
+#: erpnext/controllers/selling_controller.py:855
 msgid "Item {0} entered multiple times."
 msgstr ""
 
@@ -26639,7 +26735,7 @@ msgstr ""
 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No"
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:609
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:597
 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity."
 msgstr ""
 
@@ -26663,7 +26759,7 @@ msgstr ""
 msgid "Item {0} is disabled"
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:595
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:583
 msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated."
 msgstr ""
 
@@ -26675,7 +26771,7 @@ msgstr ""
 msgid "Item {0} is not a stock Item"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:959
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:957
 msgid "Item {0} is not a subcontracted item"
 msgstr ""
 
@@ -26683,7 +26779,7 @@ msgstr ""
 msgid "Item {0} is not a template item."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2239
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:2316
 msgid "Item {0} is not active or end of life has been reached"
 msgstr ""
 
@@ -26703,7 +26799,7 @@ msgstr ""
 msgid "Item {0} must be a non-stock item"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1590
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1667
 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}"
 msgstr ""
 
@@ -26765,7 +26861,7 @@ msgstr ""
 msgid "Item-wise sales Register"
 msgstr ""
 
-#: erpnext/stock/get_item_details.py:720
+#: erpnext/stock/get_item_details.py:731
 msgid "Item/Item Code required to get Item Tax Template."
 msgstr ""
 
@@ -26789,7 +26885,7 @@ msgstr ""
 msgid "Items Filter"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1685
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1683
 #: erpnext/selling/doctype/sales_order/sales_order.js:1719
 msgid "Items Required"
 msgstr ""
@@ -26813,11 +26909,11 @@ msgstr ""
 msgid "Items and Pricing"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4223
+#: erpnext/controllers/accounts_controller.py:4228
 msgid "Items cannot be updated as Subcontracting Inward Order(s) exist against this Subcontracted Sales Order."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4216
+#: erpnext/controllers/accounts_controller.py:4221
 msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}."
 msgstr ""
 
@@ -26829,7 +26925,7 @@ msgstr ""
 msgid "Items not found."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1245
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1322
 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}"
 msgstr ""
 
@@ -26839,7 +26935,7 @@ msgstr ""
 msgid "Items to Be Repost"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1684
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1682
 msgid "Items to Manufacture are required to pull the Raw Materials associated with it."
 msgstr ""
 
@@ -26906,7 +27002,7 @@ msgstr ""
 #: erpnext/manufacturing/doctype/job_card/job_card.json
 #: erpnext/manufacturing/doctype/job_card/job_card.py:1003
 #: erpnext/manufacturing/doctype/operation/operation.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:396
+#: erpnext/manufacturing/doctype/work_order/work_order.js:408
 #: 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
@@ -27044,7 +27140,7 @@ msgstr ""
 msgid "Job Worker Warehouse"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2704
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2768
 msgid "Job card {0} created"
 msgstr ""
 
@@ -27088,6 +27184,7 @@ msgstr ""
 #. Label of the journal_entry (Link) field in DocType 'Asset Value Adjustment'
 #. Label of the journal_entry (Link) field in DocType 'Depreciation Schedule'
 #. Label of a Workspace Sidebar Item
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.js:58
 #: erpnext/accounts/doctype/journal_entry/journal_entry.json
 #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
 #: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json
@@ -27333,7 +27430,7 @@ msgstr ""
 #. Name of a DocType
 #. Label of a Link in the Stock Workspace
 #. Label of a Workspace Sidebar Item
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:652
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:671
 #: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:88
 #: erpnext/stock/workspace/stock/stock.json
@@ -27384,7 +27481,7 @@ msgstr ""
 msgid "Last Completion Date"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:658
+#: erpnext/accounts/doctype/account/account.py:659
 msgid "Last GL Entry update was done {}. This operation is not allowed while system is actively being used. Please wait for 5 minutes before retrying."
 msgstr ""
 
@@ -27397,12 +27494,12 @@ msgstr ""
 msgid "Last Month Downtime Analysis"
 msgstr ""
 
-#: erpnext/selling/report/inactive_customers/inactive_customers.py:81
+#: erpnext/selling/report/inactive_customers/inactive_customers.py:84
 msgid "Last Order Amount"
 msgstr ""
 
 #: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:44
-#: erpnext/selling/report/inactive_customers/inactive_customers.py:82
+#: erpnext/selling/report/inactive_customers/inactive_customers.py:85
 msgid "Last Order Date"
 msgstr ""
 
@@ -27458,7 +27555,7 @@ msgstr ""
 msgid "Last carbon check date cannot be a future date"
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_item_cart.js:1025
+#: erpnext/selling/page/point_of_sale/pos_item_cart.js:1037
 msgid "Last transacted"
 msgstr ""
 
@@ -28120,7 +28217,7 @@ msgstr ""
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 #: erpnext/selling/doctype/customer/customer.json
 #: erpnext/selling/doctype/sales_order/sales_order.json
-#: erpnext/selling/page/point_of_sale/pos_item_cart.js:959
+#: erpnext/selling/page/point_of_sale/pos_item_cart.js:970
 msgid "Loyalty Points"
 msgstr ""
 
@@ -28154,7 +28251,7 @@ msgstr ""
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1206
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 #: erpnext/selling/doctype/customer/customer.json
-#: erpnext/selling/page/point_of_sale/pos_item_cart.js:952
+#: erpnext/selling/page/point_of_sale/pos_item_cart.js:963
 #: erpnext/selling/workspace/selling/selling.json
 #: erpnext/workspace_sidebar/selling.json
 msgid "Loyalty Program"
@@ -28259,17 +28356,17 @@ msgstr ""
 msgid "Maintain Asset"
 msgstr ""
 
-#. Label of the maintain_same_internal_transaction_rate (Check) field in
-#. DocType 'Accounts Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Maintain Same Rate Throughout Internal Transaction"
-msgstr ""
-
 #. Label of the is_stock_item (Check) field in DocType 'Item'
 #: erpnext/stock/doctype/item/item.json
 msgid "Maintain Stock"
 msgstr ""
 
+#. Label of the maintain_same_internal_transaction_rate (Check) field in
+#. DocType 'Accounts Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "Maintain same rate throughout internal Transaction"
+msgstr ""
+
 #. Label of the maintain_same_sales_rate (Check) field in DocType 'Selling
 #. Settings'
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
@@ -28479,8 +28576,8 @@ msgstr ""
 #. Label of the make (Data) field in DocType 'Vehicle'
 #: erpnext/accounts/doctype/journal_entry/journal_entry.js:127
 #: erpnext/manufacturing/doctype/job_card/job_card.js:480
-#: erpnext/manufacturing/doctype/work_order/work_order.js:839
-#: erpnext/manufacturing/doctype/work_order/work_order.js:873
+#: erpnext/manufacturing/doctype/work_order/work_order.js:851
+#: erpnext/manufacturing/doctype/work_order/work_order.js:885
 #: erpnext/setup/doctype/vehicle/vehicle.json
 msgid "Make"
 msgstr ""
@@ -28500,10 +28597,6 @@ msgstr ""
 msgid "Make Difference Entry"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:678
-msgid "Make Lead Time"
-msgstr ""
-
 #. Label of the make_payment_via_journal_entry (Check) field in DocType
 #. 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -28559,11 +28652,11 @@ msgstr ""
 msgid "Make project from a template."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:785
+#: erpnext/stock/doctype/item/item.js:822
 msgid "Make {0} Variant"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:787
+#: erpnext/stock/doctype/item/item.js:824
 msgid "Make {0} Variants"
 msgstr ""
 
@@ -28607,7 +28700,7 @@ msgstr ""
 msgid "Mandatory Accounting Dimension"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1881
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1912
 msgid "Mandatory Field"
 msgstr ""
 
@@ -28627,11 +28720,11 @@ msgstr ""
 msgid "Mandatory Missing"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:635
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:629
 msgid "Mandatory Purchase Order"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:656
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:651
 msgid "Mandatory Purchase Receipt"
 msgstr ""
 
@@ -28706,8 +28799,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:1334
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1350
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1411
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1427
 #: 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
@@ -28816,7 +28909,7 @@ msgstr ""
 #: erpnext/stock/doctype/batch/batch.json erpnext/stock/doctype/item/item.json
 #: erpnext/stock/doctype/item_lead_time/item_lead_time.json
 #: erpnext/stock/doctype/material_request/material_request_dashboard.py:18
-#: erpnext/stock/doctype/pick_list/pick_list_dashboard.py:20
+#: erpnext/stock/doctype/pick_list/pick_list_dashboard.py:21
 #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order_dashboard.py:13
 #: erpnext/workspace_sidebar/manufacturing.json
 msgid "Manufacturing"
@@ -28856,7 +28949,7 @@ msgstr ""
 msgid "Manufacturing Manager"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2597
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:2674
 msgid "Manufacturing Quantity is mandatory"
 msgstr ""
 
@@ -29078,7 +29171,7 @@ msgstr ""
 msgid "Material"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:864
+#: erpnext/manufacturing/doctype/work_order/work_order.js:876
 msgid "Material Consumption"
 msgstr ""
 
@@ -29086,7 +29179,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:1335
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1412
 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json
 msgid "Material Consumption for Manufacture"
 msgstr ""
@@ -29187,6 +29280,7 @@ msgstr ""
 #: erpnext/stock/doctype/stock_entry/stock_entry.js:287
 #: erpnext/stock/doctype/stock_entry/stock_entry.js:443
 #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+#: erpnext/stock/doctype/stock_settings/stock_settings.js:153
 #: erpnext/stock/workspace/stock/stock.json
 #: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
 #: erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json
@@ -29268,7 +29362,7 @@ msgstr ""
 msgid "Material Request already created for the ordered quantity"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:1860
+#: erpnext/selling/doctype/sales_order/sales_order.py:1861
 msgid "Material Request not created, as quantity for Raw Materials already available."
 msgstr ""
 
@@ -29282,7 +29376,7 @@ msgstr ""
 msgid "Material Request used to make this Stock Entry"
 msgstr ""
 
-#: erpnext/controllers/subcontracting_controller.py:1349
+#: erpnext/controllers/subcontracting_controller.py:1350
 msgid "Material Request {0} is cancelled or stopped"
 msgstr ""
 
@@ -29304,7 +29398,7 @@ msgstr ""
 msgid "Material Requests"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:451
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:452
 msgid "Material Requests Required"
 msgstr ""
 
@@ -29325,7 +29419,7 @@ msgstr ""
 msgid "Material Requirements Planning Report"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry_list.js:13
+#: erpnext/stock/doctype/stock_entry/stock_entry_list.js:15
 msgid "Material Returned from WIP"
 msgstr ""
 
@@ -29394,7 +29488,7 @@ msgid "Material from Customer"
 msgstr ""
 
 #: erpnext/buying/doctype/purchase_order/purchase_order.js:394
-#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:649
+#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:644
 msgid "Material to Supplier"
 msgstr ""
 
@@ -29403,7 +29497,7 @@ msgstr ""
 msgid "Materials To Be Transferred"
 msgstr ""
 
-#: erpnext/controllers/subcontracting_controller.py:1582
+#: erpnext/controllers/subcontracting_controller.py:1589
 msgid "Materials are already received against the {0} {1}"
 msgstr ""
 
@@ -29477,10 +29571,10 @@ msgstr ""
 msgid "Max discount allowed for item: {0} is {1}%"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1040
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1047
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1070
-#: erpnext/stock/doctype/pick_list/pick_list.js:203
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1052
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1059
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1082
+#: erpnext/stock/doctype/pick_list/pick_list.js:208
 #: erpnext/stock/doctype/stock_entry/stock_entry.js:382
 msgid "Max: {0}"
 msgstr ""
@@ -29507,11 +29601,11 @@ msgstr ""
 msgid "Maximum Producible Items"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:4121
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:4203
 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:4112
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:4194
 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}."
 msgstr ""
 
@@ -29534,7 +29628,7 @@ msgstr ""
 msgid "Maximum discount % allowed when selling this item. Eg: if set to 20%, a discount greater than 20% cannot be applied in sales transactions."
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:278
+#: erpnext/controllers/selling_controller.py:279
 msgid "Maximum discount for Item {0} is {1}%"
 msgstr ""
 
@@ -29614,7 +29708,7 @@ msgstr ""
 #. Label of the merge_similar_account_heads (Check) field in DocType 'Accounts
 #. Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Merge Similar Account Heads"
+msgid "Merge similar Account Heads"
 msgstr ""
 
 #: erpnext/public/js/utils.js:1098
@@ -29630,7 +29724,7 @@ msgstr ""
 msgid "Merged"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:601
+#: erpnext/accounts/doctype/account/account.py:602
 msgid "Merging is only possible if following properties are same in both records. Is Group, Root Type, Company and Account Currency"
 msgstr ""
 
@@ -29859,7 +29953,7 @@ msgstr ""
 msgid "Min Qty should be greater than Recurse Over Qty"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:942
+#: erpnext/stock/doctype/item/item.js:985
 msgid "Min Value: {0}, Max Value: {1}, in Increments of: {2}"
 msgstr ""
 
@@ -29957,14 +30051,14 @@ msgstr ""
 
 #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:97
 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:200
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:594
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2421
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3029
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:588
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2461
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3069
 #: erpnext/assets/doctype/asset_category/asset_category.py:116
 msgid "Missing Account"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:431
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:445
 msgid "Missing Asset"
 msgstr ""
 
@@ -29985,7 +30079,7 @@ msgstr ""
 msgid "Missing Finance Book"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1787
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1864
 msgid "Missing Finished Good"
 msgstr ""
 
@@ -29993,7 +30087,7 @@ msgstr ""
 msgid "Missing Formula"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1085
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1162
 msgid "Missing Item"
 msgstr ""
 
@@ -30013,7 +30107,7 @@ msgstr ""
 msgid "Missing Serial No Bundle"
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:171
+#: erpnext/stock/doctype/pick_list/pick_list.py:174
 msgid "Missing Warehouse"
 msgstr ""
 
@@ -30026,7 +30120,7 @@ msgid "Missing required filter: {0}"
 msgstr ""
 
 #: erpnext/manufacturing/doctype/bom/bom.py:1219
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1499
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1563
 msgid "Missing value"
 msgstr ""
 
@@ -30196,7 +30290,7 @@ msgstr ""
 msgid "Monthly Total Work Orders"
 msgstr ""
 
-#. Option for the 'Book Deferred Entries Based On' (Select) field in DocType
+#. Option for the 'Book Deferred entries based on' (Select) field in DocType
 #. 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 msgid "Months"
@@ -30267,7 +30361,7 @@ msgstr ""
 msgid "Multiple Loyalty Programs found for Customer {}. Please select manually."
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1193
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1224
 msgid "Multiple POS Opening Entry"
 msgstr ""
 
@@ -30293,7 +30387,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:1794
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1871
 msgid "Multiple items cannot be marked as finished item"
 msgstr ""
 
@@ -30302,7 +30396,7 @@ msgid "Music"
 msgstr ""
 
 #. Label of the must_be_whole_number (Check) field in DocType 'UOM'
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1446
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1510
 #: erpnext/setup/doctype/uom/uom.json
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:267
 #: erpnext/utilities/transaction_base.py:629
@@ -30380,8 +30474,13 @@ msgstr ""
 #. Settings'
 #. Label of the naming_series_details (Small Text) field in DocType 'Selling
 #. Settings'
+#. Label of the naming_series_details (Small Text) field in DocType 'Stock
+#. Settings'
+#. Label of the naming_series_preview (Small Text) field in DocType 'Stock
+#. Settings'
 #: erpnext/buying/doctype/buying_settings/buying_settings.json
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "Naming Series options"
 msgstr ""
 
@@ -30437,6 +30536,12 @@ msgstr ""
 msgid "Negative Quantity is not allowed"
 msgstr ""
 
+#. Label of the negative_stock_section (Section Break) field in DocType 'Stock
+#. Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Negative Stock"
+msgstr ""
+
 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608
 #: erpnext/stock/serial_batch_bundle.py:1548
 msgid "Negative Stock Error"
@@ -30703,9 +30808,9 @@ msgstr ""
 #: erpnext/selling/doctype/quotation/quotation.json
 #: erpnext/selling/doctype/sales_order/sales_order.json
 #: erpnext/selling/page/point_of_sale/pos_item_cart.js:100
-#: erpnext/selling/page/point_of_sale/pos_item_cart.js:522
-#: erpnext/selling/page/point_of_sale/pos_item_cart.js:526
-#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:157
+#: erpnext/selling/page/point_of_sale/pos_item_cart.js:528
+#: erpnext/selling/page/point_of_sale/pos_item_cart.js:532
+#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:161
 #: erpnext/stock/doctype/delivery_note/delivery_note.json
 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
 #: erpnext/templates/includes/order/order_taxes.html:5
@@ -30988,7 +31093,7 @@ msgstr ""
 msgid "No Answer"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2526
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2566
 msgid "No Customer found for Inter Company Transactions which represents company {0}"
 msgstr ""
 
@@ -31017,7 +31122,7 @@ msgstr ""
 msgid "No Item with Serial No {0}"
 msgstr ""
 
-#: erpnext/controllers/subcontracting_controller.py:1500
+#: erpnext/controllers/subcontracting_controller.py:1501
 msgid "No Items selected for transfer."
 msgstr ""
 
@@ -31045,14 +31150,14 @@ msgstr ""
 msgid "No POS Profile found. Please create a New POS Profile first"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1574
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1634
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1648
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1578
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1638
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1652
 #: erpnext/stock/doctype/item/item.py:1475
 msgid "No Permission"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:792
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:793
 msgid "No Purchase Orders were created"
 msgstr ""
 
@@ -31077,7 +31182,7 @@ msgstr ""
 msgid "No Summary"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2510
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2550
 msgid "No Supplier found for Inter Company Transactions which represents company {0}"
 msgstr ""
 
@@ -31101,13 +31206,13 @@ msgstr ""
 msgid "No Unreconciled Payments found for this party"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:789
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:790
 #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py:249
 msgid "No Work Orders were created"
 msgstr ""
 
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:836
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:929
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:827
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:926
 msgid "No accounting entries for the following warehouses"
 msgstr ""
 
@@ -31115,6 +31220,10 @@ msgstr ""
 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured"
 msgstr ""
 
+#: erpnext/stock/doctype/item/item_prices.html:135
+msgid "No active item prices found."
+msgstr ""
+
 #: erpnext/stock/doctype/item_variant_settings/item_variant_settings.js:46
 msgid "No additional fields available"
 msgstr ""
@@ -31159,20 +31268,20 @@ msgstr ""
 msgid "No file uploaded or URL provided."
 msgstr ""
 
-#: erpnext/controllers/subcontracting_controller.py:1391
+#: erpnext/controllers/subcontracting_controller.py:1392
 msgid "No item available for transfer."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:160
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:161
 msgid "No items are available in sales orders {0} for production"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:157
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:169
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:158
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:170
 msgid "No items are available in the sales order {0} for production"
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_item_selector.js:401
+#: erpnext/selling/page/point_of_sale/pos_item_selector.js:425
 msgid "No items found. Scan barcode again."
 msgstr ""
 
@@ -31184,7 +31293,7 @@ msgstr ""
 msgid "No matches occurred via auto reconciliation"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1041
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1039
 msgid "No material request created"
 msgstr ""
 
@@ -31276,7 +31385,7 @@ msgstr ""
 msgid "No open Material Requests found for the given criteria."
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1187
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1218
 msgid "No open POS Opening Entry found for POS Profile {0}."
 msgstr ""
 
@@ -31304,10 +31413,6 @@ msgstr ""
 msgid "No pending Material Requests found to link for the given items."
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:472
-msgid "No pending payment schedules available."
-msgstr ""
-
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:502
 msgid "No primary email found for customer: {0}"
 msgstr ""
@@ -31316,7 +31421,7 @@ msgstr ""
 msgid "No products found."
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_item_cart.js:1017
+#: erpnext/selling/page/point_of_sale/pos_item_cart.js:1029
 msgid "No recent transactions found"
 msgstr ""
 
@@ -31358,7 +31463,7 @@ msgstr ""
 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again."
 msgstr ""
 
-#. Description of the 'Stock Frozen Up To' (Date) field in DocType 'Stock
+#. Description of the 'Stock frozen up to' (Date) field in DocType 'Stock
 #. Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "No stock transactions can be created or modified before this date."
@@ -31369,11 +31474,12 @@ msgstr ""
 msgid "No values"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2574
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2614
 msgid "No {0} found for Inter Company Transactions."
 msgstr ""
 
 #: erpnext/assets/doctype/asset/asset.js:377
+#: erpnext/stock/doctype/item/item_prices.html:80
 msgid "No."
 msgstr ""
 
@@ -31432,6 +31538,12 @@ msgstr ""
 msgid "None of the items have any change in quantity or value."
 msgstr ""
 
+#. Label of the section_normal_balances (Tab Break) field in DocType 'Process
+#. Period Closing Voucher'
+#: erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.json
+msgid "Normal Balances"
+msgstr ""
+
 #. Name of a UOM
 #: erpnext/setup/setup_wizard/data/uom_data.json erpnext/stock/utils.py:693
 #: erpnext/stock/utils.py:695
@@ -31667,7 +31779,7 @@ msgstr ""
 
 #. Label of the reorder_email_notify (Check) field in DocType 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Notify by Email on Creation of Automatic Material Request"
+msgid "Notify by email on creation of automatic Material Request"
 msgstr ""
 
 #. Description of the 'Notify Via Email' (Check) field in DocType 'Appointment
@@ -31691,7 +31803,7 @@ msgstr ""
 msgid "Number of Interaction"
 msgstr ""
 
-#: erpnext/selling/report/inactive_customers/inactive_customers.py:78
+#: erpnext/selling/report/inactive_customers/inactive_customers.py:81
 msgid "Number of Order"
 msgstr ""
 
@@ -31898,7 +32010,7 @@ msgstr ""
 msgid "On enabling this cancellation entries will be posted on the actual cancellation date and reports will consider cancelled entries as well"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.js:726
+#: erpnext/manufacturing/doctype/production_plan/production_plan.js:727
 msgid "On expanding a row in the Items to Manufacture table, you'll see an option to 'Include Exploded Items'. Ticking this includes raw materials of the sub-assembly items in the production process."
 msgstr ""
 
@@ -31908,7 +32020,7 @@ msgstr ""
 msgid "On save, the Excluded Fee will be converted to an Included Fee."
 msgstr ""
 
-#. Description of the 'Use Serial / Batch Fields' (Check) field in DocType
+#. Description of the 'Use Serial / Batch fields' (Check) field in DocType
 #. 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "On submission of the stock transaction, system will auto create the Serial and Batch Bundle based on the Serial No / Batch fields."
@@ -31929,7 +32041,7 @@ msgstr ""
 msgid "Once set, this invoice will be on hold till the set date"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:751
+#: erpnext/manufacturing/doctype/work_order/work_order.js:763
 msgid "Once the Work Order is Closed. It can't be resumed."
 msgstr ""
 
@@ -31996,7 +32108,7 @@ msgstr ""
 msgid "Only Value available for Payment Entry"
 msgstr ""
 
-#. Description of the 'Posting Date Inheritance for Exchange Gain / Loss'
+#. Description of the 'Posting Date inheritance for exchange gain / loss'
 #. (Select) field in DocType 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 msgid "Only applies for Normal Payments"
@@ -32025,7 +32137,7 @@ msgstr ""
 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:1349
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1426
 msgid "Only one {0} entry can be created against the Work Order {1}"
 msgstr ""
 
@@ -32241,6 +32353,8 @@ msgstr ""
 
 #. Label of the z_opening_balances (Table) field in DocType 'Process Period
 #. Closing Voucher'
+#. Label of the section_opening_balances (Tab Break) field in DocType 'Process
+#. Period Closing Voucher'
 #: erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.json
 msgid "Opening Balances"
 msgstr ""
@@ -32290,8 +32404,8 @@ msgstr ""
 msgid "Opening Invoice Tool"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1654
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1990
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1674
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2021
 msgid "Opening Invoice has rounding adjustment of {0}.<br><br> '{1}' account is required to post these values. Please set it in Company: {2}.<br><br> Or, '{3}' can be enabled to not post any rounding adjustment."
 msgstr ""
 
@@ -32437,7 +32551,7 @@ msgstr ""
 #. Charges'
 #: erpnext/manufacturing/doctype/bom_item/bom_item.json
 #: erpnext/manufacturing/doctype/job_card/job_card.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:332
+#: erpnext/manufacturing/doctype/work_order/work_order.js:344
 #: erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
 msgid "Operation ID"
 msgstr ""
@@ -32466,7 +32580,7 @@ msgstr ""
 msgid "Operation Time"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1508
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1572
 msgid "Operation Time must be greater than 0 for Operation {0}"
 msgstr ""
 
@@ -32501,7 +32615,7 @@ msgstr ""
 #. Label of the operations (Table) field in DocType 'Work Order'
 #. Label of the operation (Section Break) field in DocType 'Email Digest'
 #: erpnext/manufacturing/doctype/bom/bom.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:313
+#: erpnext/manufacturing/doctype/work_order/work_order.js:325
 #: erpnext/manufacturing/doctype/work_order/work_order.json
 #: erpnext/setup/doctype/company/company.py:469
 #: erpnext/setup/doctype/email_digest/email_digest.json
@@ -32676,7 +32790,7 @@ msgstr ""
 msgid "Optimize Route"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1017
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1029
 msgid "Optional. Select a specific manufacture entry to reverse."
 msgstr ""
 
@@ -32967,7 +33081,7 @@ msgstr ""
 msgid "Out of Order"
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:632
+#: erpnext/stock/doctype/pick_list/pick_list.py:635
 msgid "Out of Stock"
 msgstr ""
 
@@ -32983,7 +33097,7 @@ msgstr ""
 msgid "Out of stock"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1200
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1231
 #: erpnext/selling/page/point_of_sale/pos_controller.js:208
 msgid "Outdated POS Opening Entry"
 msgstr ""
@@ -33090,7 +33204,7 @@ msgstr ""
 msgid "Over Billing Allowance (%)"
 msgstr ""
 
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1348
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1339
 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%"
 msgstr ""
 
@@ -33110,7 +33224,7 @@ msgstr ""
 #. Label of the over_picking_allowance (Percent) field in DocType 'Stock
 #. Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Over Picking Allowance"
+msgid "Over Picking Allowance (%)"
 msgstr ""
 
 #: erpnext/controllers/stock_controller.py:1737
@@ -33121,14 +33235,11 @@ msgstr ""
 msgid "Over Receipt/Delivery of {0} {1} ignored for item {2} because you have {3} role."
 msgstr ""
 
-#. Label of the mr_qty_allowance (Float) field in DocType 'Stock Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Over Transfer Allowance"
-msgstr ""
-
 #. Label of the over_transfer_allowance (Float) field in DocType 'Buying
 #. Settings'
+#. Label of the mr_qty_allowance (Float) field in DocType 'Stock Settings'
 #: erpnext/buying/doctype/buying_settings/buying_settings.json
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "Over Transfer Allowance (%)"
 msgstr ""
 
@@ -33164,7 +33275,6 @@ msgstr ""
 #: erpnext/projects/report/project_summary/project_summary.py:100
 #: erpnext/projects/web_form/tasks/tasks.json
 #: erpnext/selling/doctype/sales_order/sales_order_list.js:30
-#: erpnext/templates/pages/task_info.html:75
 msgid "Overdue"
 msgstr ""
 
@@ -33441,7 +33551,7 @@ msgstr ""
 msgid "POS Opening Entry"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1201
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1232
 msgid "POS Opening Entry - {0} is outdated. Please close the POS and create a new POS Opening Entry."
 msgstr ""
 
@@ -33462,7 +33572,7 @@ msgstr ""
 msgid "POS Opening Entry Exists"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1186
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1217
 msgid "POS Opening Entry Missing"
 msgstr ""
 
@@ -33498,7 +33608,7 @@ msgstr ""
 msgid "POS Profile"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1194
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1225
 msgid "POS Profile - {0} has multiple open POS Opening Entries. Please close or cancel the existing entries before proceeding."
 msgstr ""
 
@@ -33516,11 +33626,11 @@ msgstr ""
 msgid "POS Profile doesn't match {}"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1154
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1185
 msgid "POS Profile is mandatory to mark this invoice as POS Transaction."
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1383
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1414
 msgid "POS Profile required to make POS Entry"
 msgstr ""
 
@@ -33663,7 +33773,7 @@ msgstr ""
 msgid "Packing Slip Item"
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:660
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:622
 msgid "Packing Slip(s) cancelled"
 msgstr ""
 
@@ -33753,8 +33863,8 @@ msgstr ""
 msgid "Paid To Account Type"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:327
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1150
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:329
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1181
 msgid "Paid amount + Write Off Amount can not be greater than Grand Total"
 msgstr ""
 
@@ -33966,7 +34076,7 @@ msgstr ""
 msgid "Partial Material Transferred"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1173
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1204
 msgid "Partial Payment in POS Transactions are not allowed."
 msgstr ""
 
@@ -33974,7 +34084,7 @@ msgstr ""
 msgid "Partial Stock Reservation"
 msgstr ""
 
-#. Description of the 'Allow Partial Reservation' (Check) field in DocType
+#. Description of the 'Allow partial reservation' (Check) field in DocType
 #. 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "Partial stock can be reserved. For example, If you have a Sales Order of 100 units and the Available Stock is 90 units then a Stock Reservation Entry will be created for 90 units. "
@@ -34180,6 +34290,7 @@ msgstr ""
 #: erpnext/public/js/bank_reconciliation_tool/data_table_manager.js:50
 #: erpnext/public/js/bank_reconciliation_tool/dialog_manager.js:135
 #: erpnext/selling/doctype/quotation/quotation.json
+#: erpnext/stock/doctype/item/item_prices.html:83
 #: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:86
 msgid "Party"
 msgstr ""
@@ -34506,7 +34617,7 @@ msgstr ""
 msgid "Payer Settings"
 msgstr ""
 
-#. Option for the 'Posting Date Inheritance for Exchange Gain / Loss' (Select)
+#. Option for the 'Posting Date inheritance for exchange gain / loss' (Select)
 #. field in DocType 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 #: erpnext/accounts/doctype/dunning/dunning.js:51
@@ -34611,6 +34722,7 @@ msgstr ""
 #. Order'
 #. Label of a Link in the Invoicing Workspace
 #. Label of a Workspace Sidebar Item
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.js:59
 #: erpnext/accounts/doctype/bank_clearance_detail/bank_clearance_detail.json
 #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json
 #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
@@ -34798,17 +34910,13 @@ msgstr ""
 msgid "Payment Received"
 msgstr ""
 
-#. Label of a Workspace Sidebar Item
-#: erpnext/workspace_sidebar/invoicing.json
-msgid "Payment Reconciliation"
-msgstr ""
-
 #. Name of a DocType
 #. Label of the payment_reconciliation (Table) field in DocType 'POS Closing
 #. Entry'
 #. Label of a Workspace Sidebar Item
 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
 #: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.json
+#: erpnext/workspace_sidebar/invoicing.json
 #: erpnext/workspace_sidebar/payments.json
 msgid "Payment Reconciliation"
 msgstr ""
@@ -34907,8 +35015,8 @@ msgstr ""
 msgid "Payment Requests cannot be created against: {0}"
 msgstr ""
 
-#. Description of the 'Create in Draft Status' (Check) field in DocType
-#. 'Accounts Settings'
+#. Description of the 'Create payment requests in Draft status' (Check) field
+#. in DocType 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 msgid "Payment Requests made from Sales / Purchase Invoice will be put in Draft explicitly"
 msgstr ""
@@ -34929,7 +35037,7 @@ msgstr ""
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 #: erpnext/buying/doctype/purchase_order/purchase_order.json
-#: erpnext/controllers/accounts_controller.py:2748
+#: erpnext/controllers/accounts_controller.py:2750
 #: erpnext/selling/doctype/quotation/quotation.json
 #: erpnext/selling/doctype/sales_order/sales_order.json
 msgid "Payment Schedule"
@@ -34939,7 +35047,7 @@ msgstr ""
 msgid "Payment Schedule based Payment Requests cannot be created because a Payment Entry already exists for this document."
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:483
+#: erpnext/public/js/controllers/transaction.js:486
 msgid "Payment Schedules"
 msgstr ""
 
@@ -34961,7 +35069,7 @@ msgstr ""
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1187
 #: erpnext/accounts/report/gross_profit/gross_profit.py:449
 #: erpnext/accounts/workspace/invoicing/invoicing.json
-#: erpnext/public/js/controllers/transaction.js:498
+#: erpnext/public/js/controllers/transaction.js:501
 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:30
 #: erpnext/workspace_sidebar/accounts_setup.json
 msgid "Payment Term"
@@ -35038,7 +35146,7 @@ msgstr ""
 msgid "Payment Terms Template Detail"
 msgstr ""
 
-#. Description of the 'Automatically Fetch Payment Terms from Order/Quotation'
+#. Description of the 'Automatically fetch Payment Terms from Order/Quotation'
 #. (Check) field in DocType 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 msgid "Payment Terms from orders will be fetched into the invoices as is"
@@ -35081,7 +35189,7 @@ msgstr ""
 msgid "Payment methods are mandatory. Please add at least one payment method."
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3033
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3073
 msgid "Payment methods refreshed. Please review before proceeding."
 msgstr ""
 
@@ -35210,7 +35318,7 @@ msgstr ""
 #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:254
 #: erpnext/manufacturing/doctype/job_card/job_card.json
 #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:337
+#: erpnext/manufacturing/doctype/work_order/work_order.js:349
 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
 #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:182
 #: erpnext/selling/doctype/sales_order/sales_order.js:1688
@@ -35236,7 +35344,6 @@ msgstr ""
 #. Option in a Select field in the tasks Web Form
 #: erpnext/projects/doctype/task/task.json
 #: erpnext/projects/web_form/tasks/tasks.json
-#: erpnext/templates/pages/task_info.html:74
 msgid "Pending Review"
 msgstr ""
 
@@ -35388,12 +35495,6 @@ msgstr ""
 msgid "Period Closing Entry For Current Period"
 msgstr ""
 
-#. Label of the period_closing_settings_section (Section Break) field in
-#. DocType 'Accounts Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Period Closing Settings"
-msgstr ""
-
 #. Label of the period_closing_voucher (Link) field in DocType 'Account Closing
 #. Balance'
 #. Name of a DocType
@@ -35602,7 +35703,7 @@ msgstr ""
 #. Label of the customer_phone_number (Data) field in DocType 'Appointment'
 #: erpnext/accounts/doctype/payment_request/payment_request.json
 #: erpnext/crm/doctype/appointment/appointment.json
-#: erpnext/selling/page/point_of_sale/pos_item_cart.js:946
+#: erpnext/selling/page/point_of_sale/pos_item_cart.js:957
 msgid "Phone Number"
 msgstr ""
 
@@ -35618,17 +35719,20 @@ msgstr ""
 #: erpnext/stock/doctype/pick_list/pick_list.json
 #: erpnext/stock/doctype/stock_entry/stock_entry.json
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
+#: erpnext/stock/doctype/stock_settings/stock_settings.js:154
 #: erpnext/stock/workspace/stock/stock.json
 #: erpnext/workspace_sidebar/stock.json
 msgid "Pick List"
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:267
+#: erpnext/stock/doctype/pick_list/pick_list.py:270
 msgid "Pick List Incomplete"
 msgstr ""
 
+#. Label of the pick_list_item (Data) field in DocType 'Sales Invoice Item'
 #. Label of the pick_list_item (Data) field in DocType 'Delivery Note Item'
 #. Name of a DocType
+#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
 #: erpnext/stock/doctype/pick_list_item/pick_list_item.json
 msgid "Pick List Item"
@@ -35942,7 +36046,7 @@ msgstr ""
 msgid "Plants and Machineries"
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:629
+#: erpnext/stock/doctype/pick_list/pick_list.py:632
 msgid "Please Restock Items and Update the Pick List to continue. To discontinue, cancel the Pick List."
 msgstr ""
 
@@ -35974,7 +36078,7 @@ msgstr ""
 msgid "Please Set Supplier Group in Buying Settings."
 msgstr ""
 
-#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1881
+#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1910
 msgid "Please Specify Account"
 msgstr ""
 
@@ -35990,7 +36094,7 @@ msgstr ""
 msgid "Please add Operations first."
 msgstr ""
 
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:213
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:214
 msgid "Please add Request for Quotation to the sidebar in Portal Settings."
 msgstr ""
 
@@ -36022,7 +36126,7 @@ msgstr ""
 msgid "Please add the account to root level Company - {}"
 msgstr ""
 
-#: erpnext/controllers/website_list_for_contact.py:298
+#: erpnext/controllers/website_list_for_contact.py:301
 msgid "Please add {1} role to user {0}."
 msgstr ""
 
@@ -36034,7 +36138,7 @@ msgstr ""
 msgid "Please attach CSV file"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3172
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3219
 msgid "Please cancel and amend the Payment Entry"
 msgstr ""
 
@@ -36157,11 +36261,11 @@ msgstr ""
 msgid "Please enable Applicable on Purchase Order and Applicable on Booking Actual Expenses"
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:318
+#: erpnext/stock/doctype/pick_list/pick_list.py:321
 msgid "Please enable Use Old Serial / Batch Fields to make_bundle"
 msgstr ""
 
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.js:21
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.js:24
 msgid "Please enable only if the understand the effects of enabling this."
 msgstr ""
 
@@ -36169,32 +36273,32 @@ msgstr ""
 msgid "Please enable {0} in the {1}."
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:858
+#: erpnext/controllers/selling_controller.py:857
 msgid "Please enable {} in {} to allow same item in multiple rows"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:374
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:376
 msgid "Please ensure that the {0} account is a Balance Sheet account. You can change the parent account to a Balance Sheet account or select a different account."
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:382
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:384
 msgid "Please ensure that the {0} account {1} is a Payable account. You can change the account type to Payable or select a different account."
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1013
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1044
 msgid "Please ensure {} account is a Balance Sheet account."
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1023
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1054
 msgid "Please ensure {} account {} is a Receivable account."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:764
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:841
 msgid "Please enter <b>Difference Account</b> or set default <b>Stock Adjustment Account</b> for company {0}"
 msgstr ""
 
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:555
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1285
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1316
 msgid "Please enter Account for Change Amount"
 msgstr ""
 
@@ -36227,7 +36331,7 @@ msgstr ""
 msgid "Please enter Item Code to get Batch Number"
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:2997
+#: erpnext/public/js/controllers/transaction.js:3016
 msgid "Please enter Item Code to get batch no"
 msgstr ""
 
@@ -36239,7 +36343,7 @@ msgstr ""
 msgid "Please enter Maintenance Details first"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:195
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:196
 msgid "Please enter Planned Qty for Item {0} at row {1}"
 msgstr ""
 
@@ -36279,11 +36383,19 @@ msgstr ""
 msgid "Please enter Warehouse and Date"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:660
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1281
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:655
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1312
 msgid "Please enter Write Off Account"
 msgstr ""
 
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:665
+msgid "Please enter a valid Write Off Account"
+msgstr ""
+
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:676
+msgid "Please enter a valid Write Off Cost Center"
+msgstr ""
+
 #: erpnext/selling/doctype/sales_order/sales_order.js:723
 msgid "Please enter a valid number of deliveries"
 msgstr ""
@@ -36300,7 +36412,7 @@ msgstr ""
 msgid "Please enter company name first"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2974
+#: erpnext/controllers/accounts_controller.py:2969
 msgid "Please enter default currency in Company Master"
 msgstr ""
 
@@ -36340,7 +36452,7 @@ msgstr ""
 msgid "Please enter the phone number first"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:1196
+#: erpnext/controllers/buying_controller.py:1183
 msgid "Please enter the {schedule_date}."
 msgstr ""
 
@@ -36356,11 +36468,11 @@ msgstr ""
 msgid "Please enter {0} first"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:451
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:452
 msgid "Please fill the Material Requests table"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:344
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:345
 msgid "Please fill the Sales Orders table"
 msgstr ""
 
@@ -36400,7 +36512,7 @@ msgstr ""
 msgid "Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:691
+#: erpnext/stock/doctype/item/item.js:728
 msgid "Please mention 'Weight UOM' along with Weight."
 msgstr ""
 
@@ -36450,16 +36562,16 @@ msgstr ""
 msgid "Please select <b>Template Type</b> to download template"
 msgstr ""
 
-#: erpnext/controllers/taxes_and_totals.py:846
-#: erpnext/public/js/controllers/taxes_and_totals.js:813
+#: erpnext/controllers/taxes_and_totals.py:859
+#: erpnext/public/js/controllers/taxes_and_totals.js:822
 msgid "Please select Apply Discount On"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:1777
+#: erpnext/selling/doctype/sales_order/sales_order.py:1778
 msgid "Please select BOM against item {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:190
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:191
 msgid "Please select BOM for Item in Row {0}"
 msgstr ""
 
@@ -36481,7 +36593,7 @@ msgstr ""
 msgid "Please select Charge Type first"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494
+#: erpnext/accounts/doctype/journal_entry/journal_entry.js:496
 msgid "Please select Company"
 msgstr ""
 
@@ -36490,7 +36602,7 @@ msgstr ""
 msgid "Please select Company and Posting Date to getting entries"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742
+#: erpnext/accounts/doctype/journal_entry/journal_entry.js:744
 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28
 msgid "Please select Company first"
 msgstr ""
@@ -36539,7 +36651,7 @@ msgstr ""
 msgid "Please select Posting Date before selecting Party"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743
+#: erpnext/accounts/doctype/journal_entry/journal_entry.js:745
 msgid "Please select Posting Date first"
 msgstr ""
 
@@ -36547,7 +36659,7 @@ msgstr ""
 msgid "Please select Price List"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:1779
+#: erpnext/selling/doctype/sales_order/sales_order.py:1780
 msgid "Please select Qty against item {0}"
 msgstr ""
 
@@ -36567,11 +36679,11 @@ msgstr ""
 msgid "Please select Stock Asset Account"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1713
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1790
 msgid "Please select Subcontracting Order instead of Purchase Order {0}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2823
+#: erpnext/controllers/accounts_controller.py:2825
 msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
 msgstr ""
 
@@ -36580,7 +36692,7 @@ msgid "Please select a BOM"
 msgstr ""
 
 #: erpnext/accounts/party.py:417
-#: erpnext/stock/doctype/pick_list/pick_list.py:1691
+#: erpnext/stock/doctype/pick_list/pick_list.py:1741
 msgid "Please select a Company"
 msgstr ""
 
@@ -36588,7 +36700,7 @@ msgstr ""
 #: erpnext/manufacturing/doctype/bom/bom.js:727
 #: erpnext/manufacturing/doctype/bom/bom.py:279
 #: erpnext/public/js/controllers/accounts.js:277
-#: erpnext/public/js/controllers/transaction.js:3296
+#: erpnext/public/js/controllers/transaction.js:3315
 msgid "Please select a Company first."
 msgstr ""
 
@@ -36612,7 +36724,7 @@ msgstr ""
 msgid "Please select a Warehouse"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1617
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1615
 msgid "Please select a Work Order first."
 msgstr ""
 
@@ -36640,7 +36752,7 @@ msgstr ""
 msgid "Please select a default mode of payment"
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_item_cart.js:816
+#: erpnext/selling/page/point_of_sale/pos_item_cart.js:827
 msgid "Please select a field to edit from numpad"
 msgstr ""
 
@@ -36685,7 +36797,7 @@ msgstr ""
 msgid "Please select at least one filter: Item Code, Batch, or Serial No."
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:583
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:571
 msgid "Please select at least one item to update delivered quantity."
 msgstr ""
 
@@ -36697,7 +36809,7 @@ msgstr ""
 msgid "Please select at least one row with difference value"
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:526
+#: erpnext/public/js/controllers/transaction.js:529
 msgid "Please select at least one schedule."
 msgstr ""
 
@@ -36705,11 +36817,11 @@ msgstr ""
 msgid "Please select atleast one item to continue"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:380
+#: erpnext/manufacturing/doctype/work_order/work_order.js:392
 msgid "Please select atleast one operation to create Job Card"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1713
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1717
 msgid "Please select correct account"
 msgstr ""
 
@@ -36755,7 +36867,7 @@ msgstr ""
 msgid "Please select the Multiple Tier Program type for more than one collection rules."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:359
+#: erpnext/stock/doctype/item/item.js:360
 msgid "Please select the Warehouse first"
 msgstr ""
 
@@ -36809,7 +36921,7 @@ msgstr ""
 msgid "Please set Account"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1881
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1912
 msgid "Please set Account for Change Amount"
 msgstr ""
 
@@ -36861,7 +36973,7 @@ msgstr ""
 msgid "Please set Fixed Asset Account in Asset Category {0}"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:591
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:585
 msgid "Please set Fixed Asset Account in {} against {}."
 msgstr ""
 
@@ -36911,7 +37023,7 @@ msgstr ""
 msgid "Please set a default Holiday List for Employee {0} or Company {1}"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1118
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1137
 msgid "Please set account in Warehouse {0}"
 msgstr ""
 
@@ -36940,19 +37052,19 @@ msgstr ""
 msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2418
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2458
 msgid "Please set default Cash or Bank account in Mode of Payment {0}"
 msgstr ""
 
 #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:94
 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:197
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3026
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3066
 msgid "Please set default Cash or Bank account in Mode of Payment {}"
 msgstr ""
 
 #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:96
 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:199
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3028
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3068
 msgid "Please set default Cash or Bank account in Mode of Payments {}"
 msgstr ""
 
@@ -36993,7 +37105,7 @@ msgstr ""
 msgid "Please set opening number of booked depreciations"
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:2684
+#: erpnext/public/js/controllers/transaction.js:2685
 msgid "Please set recurring after saving"
 msgstr ""
 
@@ -37005,15 +37117,15 @@ msgstr ""
 msgid "Please set the Default Cost Center in {0} company."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:668
+#: erpnext/manufacturing/doctype/work_order/work_order.js:680
 msgid "Please set the Item Code first"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1680
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1678
 msgid "Please set the Target Warehouse in the Job Card"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1684
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1682
 msgid "Please set the WIP Warehouse in the Job Card"
 msgstr ""
 
@@ -37036,7 +37148,7 @@ msgstr ""
 msgid "Please set {0} first."
 msgstr ""
 
-#: erpnext/stock/doctype/batch/batch.py:214
+#: erpnext/stock/doctype/batch/batch.py:213
 msgid "Please set {0} for Batched Item {1}, which is used to set {2} on Submit."
 msgstr ""
 
@@ -37074,7 +37186,7 @@ msgstr ""
 msgid "Please specify Company to proceed"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3205
+#: erpnext/controllers/accounts_controller.py:3200
 #: erpnext/public/js/controllers/accounts.js:117
 msgid "Please specify a valid Row ID for row {0} in table {1}"
 msgstr ""
@@ -37312,18 +37424,18 @@ msgstr ""
 msgid "Posting Date"
 msgstr ""
 
-#. Label of the exchange_gain_loss_posting_date (Select) field in DocType
-#. 'Accounts Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Posting Date Inheritance for Exchange Gain / Loss"
-msgstr ""
-
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:270
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:144
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:269
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:143
 msgid "Posting Date cannot be future date"
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:1109
+#. Label of the exchange_gain_loss_posting_date (Select) field in DocType
+#. 'Accounts Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "Posting Date inheritance for exchange gain / loss"
+msgstr ""
+
+#: erpnext/public/js/controllers/transaction.js:1110
 msgid "Posting Date will change to today's date as Edit Posting Date and Time is unchecked. Are you sure want to proceed?"
 msgstr ""
 
@@ -37386,7 +37498,7 @@ msgstr ""
 msgid "Posting Time"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2547
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:2624
 msgid "Posting date and posting time is mandatory"
 msgstr ""
 
@@ -37577,6 +37689,7 @@ msgstr ""
 #. 'Pricing Rule'
 #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:230
+#: erpnext/selling/page/point_of_sale/pos_item_selector.js:116
 msgid "Price"
 msgstr ""
 
@@ -37638,6 +37751,7 @@ msgstr ""
 #: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py:44
 #: erpnext/selling/workspace/selling/selling.json
 #: erpnext/stock/doctype/delivery_note/delivery_note.json
+#: erpnext/stock/doctype/item/item_prices.html:81
 #: erpnext/stock/doctype/item_price/item_price.json
 #: erpnext/stock/doctype/material_request/material_request.json
 #: erpnext/stock/doctype/price_list/price_list.json
@@ -37684,7 +37798,7 @@ msgstr ""
 msgid "Price List Currency"
 msgstr ""
 
-#: erpnext/stock/get_item_details.py:1334
+#: erpnext/stock/get_item_details.py:1345
 msgid "Price List Currency not selected"
 msgstr ""
 
@@ -37742,7 +37856,7 @@ msgstr ""
 #. Item'
 #. Label of the price_list_rate (Currency) field in DocType 'Purchase Receipt
 #. Item'
-#. Option for the 'Update Price List Based On' (Select) field in DocType 'Stock
+#. Option for the 'Update Price List based on' (Select) field in DocType 'Stock
 #. Settings'
 #: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
 #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -37827,12 +37941,19 @@ msgstr ""
 msgid "Price per Unit (Stock UOM)"
 msgstr ""
 
+#. Label of the prices_html (HTML) field in DocType 'Item'
+#: erpnext/stock/doctype/item/item.json
+msgid "Prices HTML"
+msgstr ""
+
 #. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings'
 #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings'
+#. Label of the pricing_tab (Tab Break) field in DocType 'Item'
 #: erpnext/buying/doctype/buying_settings/buying_settings.json
 #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13
 #: erpnext/selling/doctype/customer/customer_dashboard.py:27
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
+#: erpnext/stock/doctype/item/item.json
 #: erpnext/stock/doctype/item/item_dashboard.py:19
 msgid "Pricing"
 msgstr ""
@@ -38029,7 +38150,7 @@ msgid "Print Preferences"
 msgstr ""
 
 #: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:63
-#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:270
+#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:274
 msgid "Print Receipt"
 msgstr ""
 
@@ -38524,7 +38645,7 @@ msgstr ""
 msgid "Production Plan"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:155
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:156
 msgid "Production Plan Already Submitted"
 msgstr ""
 
@@ -39177,6 +39298,7 @@ msgstr ""
 #. Option for the 'Reference Type' (Select) field in DocType 'Quality
 #. Inspection'
 #. Label of a Workspace Sidebar Item
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.js:60
 #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -39244,12 +39366,12 @@ msgstr ""
 msgid "Purchase Invoice cannot be made against an existing asset {0}"
 msgstr ""
 
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:453
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:467
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:444
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:458
 msgid "Purchase Invoice {0} is already submitted"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1939
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1961
 msgid "Purchase Invoices"
 msgstr ""
 
@@ -39273,6 +39395,7 @@ msgstr ""
 #. Item'
 #. Label of a Link in the Subcontracting Workspace
 #. Label of a Workspace Sidebar Item
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.js:61
 #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:156
 #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -39289,7 +39412,7 @@ msgstr ""
 #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js:48
 #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:203
 #: erpnext/buying/workspace/buying/buying.json
-#: erpnext/controllers/buying_controller.py:929
+#: erpnext/controllers/buying_controller.py:916
 #: 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
@@ -39364,7 +39487,7 @@ msgstr ""
 msgid "Purchase Order Item Supplied"
 msgstr ""
 
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1044
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1041
 msgid "Purchase Order Item reference is missing in Subcontracting Receipt {0}"
 msgstr ""
 
@@ -39377,11 +39500,11 @@ msgstr ""
 msgid "Purchase Order Pricing Rule"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:631
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:625
 msgid "Purchase Order Required"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:626
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:620
 msgid "Purchase Order Required for item {}"
 msgstr ""
 
@@ -39399,7 +39522,7 @@ msgstr ""
 msgid "Purchase Order already created for all Sales Order items"
 msgstr ""
 
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:339
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:338
 msgid "Purchase Order number required for Item {0}"
 msgstr ""
 
@@ -39407,11 +39530,11 @@ msgstr ""
 msgid "Purchase Order {0} created"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:669
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:685
 msgid "Purchase Order {0} is not submitted"
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:951
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:939
 msgid "Purchase Orders"
 msgstr ""
 
@@ -39464,9 +39587,10 @@ msgstr ""
 #. Reservation Entry'
 #. Label of a Link in the Stock Workspace
 #. Label of a Workspace Sidebar Item
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.js:62
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:181
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:628
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:638
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:647
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:657
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:49
 #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:244
@@ -39483,6 +39607,7 @@ msgstr ""
 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
+#: erpnext/stock/doctype/stock_settings/stock_settings.js:151
 #: erpnext/stock/workspace/stock/stock.json
 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:68
 #: erpnext/workspace_sidebar/stock.json
@@ -39525,11 +39650,11 @@ msgstr ""
 msgid "Purchase Receipt No"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:652
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:647
 msgid "Purchase Receipt Required"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:647
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:642
 msgid "Purchase Receipt Required for item {}"
 msgstr ""
 
@@ -39553,11 +39678,11 @@ msgstr ""
 msgid "Purchase Receipt doesn't have any Item for which Retain Sample is enabled."
 msgstr ""
 
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1120
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1117
 msgid "Purchase Receipt {0} created."
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:676
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:692
 msgid "Purchase Receipt {0} is not submitted"
 msgstr ""
 
@@ -39673,7 +39798,7 @@ msgstr ""
 #. Label of the purpose (Select) field in DocType 'Stock Reconciliation'
 #: erpnext/assets/doctype/asset_movement/asset_movement.json
 #: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:163
-#: erpnext/stock/doctype/item/item_list.js:40
+#: erpnext/stock/doctype/item/item_list.js:41
 #: erpnext/stock/doctype/material_request/material_request.json
 #: erpnext/stock/doctype/pick_list/pick_list.json
 #: erpnext/stock/doctype/stock_entry/stock_entry.js:459
@@ -39683,7 +39808,7 @@ msgstr ""
 msgid "Purpose"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:581
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:658
 msgid "Purpose must be one of {0}"
 msgstr ""
 
@@ -39722,6 +39847,7 @@ msgstr ""
 #. Label of the qty_section (Section Break) field in DocType 'Job Card 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 (Float) field in DocType 'Work Order Additional Item'
 #. Label of the qty_section (Section Break) field in DocType 'Work Order Item'
 #. Label of the qty (Float) field in DocType 'Delivery Schedule Item'
 #. Label of the qty (Float) field in DocType 'Product Bundle Item'
@@ -39756,6 +39882,7 @@ msgstr ""
 #: erpnext/manufacturing/doctype/job_card_item/job_card_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_additional_item/work_order_additional_item.json
 #: erpnext/manufacturing/doctype/work_order_item/work_order_item.json
 #: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:28
 #: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:69
@@ -39884,7 +40011,7 @@ msgstr ""
 msgid "Qty To Manufacture"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1442
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1506
 msgid "Qty To Manufacture ({0}) cannot be a fraction for the UOM {2}. To allow this, disable '{1}' in the UOM {2}."
 msgstr ""
 
@@ -39939,8 +40066,8 @@ msgstr ""
 msgid "Qty for which recursion isn't applicable."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1045
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1068
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1057
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1080
 msgid "Qty for {0}"
 msgstr ""
 
@@ -39953,12 +40080,12 @@ msgid "Qty in Stock UOM"
 msgstr ""
 
 #. Label of the for_qty (Float) field in DocType 'Pick List'
-#: erpnext/stock/doctype/pick_list/pick_list.js:201
+#: erpnext/stock/doctype/pick_list/pick_list.js:206
 #: erpnext/stock/doctype/pick_list/pick_list.json
 msgid "Qty of Finished Goods Item"
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:676
+#: erpnext/stock/doctype/pick_list/pick_list.py:679
 msgid "Qty of Finished Goods Item should be greater than 0."
 msgstr ""
 
@@ -40165,6 +40292,10 @@ msgstr ""
 msgid "Quality Inspection Analysis"
 msgstr ""
 
+#: erpnext/public/js/controllers/transaction.js:2946
+msgid "Quality Inspection Not Configured"
+msgstr ""
+
 #. Name of a DocType
 #: erpnext/stock/doctype/quality_inspection_parameter/quality_inspection_parameter.json
 msgid "Quality Inspection Parameter"
@@ -40191,12 +40322,6 @@ msgstr ""
 msgid "Quality Inspection Required"
 msgstr ""
 
-#. Label of the quality_inspection_settings_section (Section Break) field in
-#. DocType 'Stock Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Quality Inspection Settings"
-msgstr ""
-
 #. Name of a report
 #. Label of a Link in the Manufacturing Workspace
 #. Label of a Workspace Sidebar Item
@@ -40441,12 +40566,22 @@ msgstr ""
 msgid "Quantity (Output Qty)"
 msgstr ""
 
+#: erpnext/selling/page/point_of_sale/pos_item_selector.js:118
+msgid "Quantity Available"
+msgstr ""
+
 #. Label of the quantity_difference (Read Only) field in DocType 'Stock
 #. Reconciliation Item'
 #: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
 msgid "Quantity Difference"
 msgstr ""
 
+#. Label of the section_break_9 (Section Break) field in DocType 'Stock
+#. Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Quantity Tolerance"
+msgstr ""
+
 #. Label of the section_break_19 (Section Break) field in DocType 'Pricing
 #. Rule'
 #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -40523,8 +40658,8 @@ msgstr ""
 msgid "Quantity must be less than or equal to {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1098
-#: erpnext/stock/doctype/pick_list/pick_list.js:209
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1110
+#: erpnext/stock/doctype/pick_list/pick_list.js:214
 msgid "Quantity must not be more than {0}"
 msgstr ""
 
@@ -40539,15 +40674,15 @@ msgstr ""
 msgid "Quantity should be greater than 0"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:342
+#: erpnext/manufacturing/doctype/work_order/work_order.js:354
 msgid "Quantity to Manufacture"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2642
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2706
 msgid "Quantity to Manufacture can not be zero for the operation {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1434
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1498
 msgid "Quantity to Manufacture must be greater than 0."
 msgstr ""
 
@@ -40584,7 +40719,7 @@ msgstr ""
 msgid "Queue Size should be between 5 and 100"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625
+#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627
 msgid "Quick Journal Entry"
 msgstr ""
 
@@ -40726,13 +40861,13 @@ msgstr ""
 msgid "RFQ and Purchase Order Settings"
 msgstr ""
 
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:132
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:133
 msgid "RFQs are not allowed for {0} due to a scorecard standing of {1}"
 msgstr ""
 
 #. Label of the auto_indent (Check) field in DocType 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Raise Material Request When Stock Reaches Re-order Level"
+msgid "Raise Material Request when stock reaches re-order level"
 msgstr ""
 
 #. Label of the complaint_raised_by (Data) field in DocType 'Warranty Claim'
@@ -40771,6 +40906,7 @@ msgstr ""
 #. 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 Secondary Item'
+#. Label of the rate (Currency) field in DocType 'Work Order Additional 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'
@@ -40781,7 +40917,7 @@ msgstr ""
 #. Label of the rate (Currency) field in DocType 'Material Request Item'
 #. Label of the rate (Currency) field in DocType 'Packed Item'
 #. Label of the rate (Currency) field in DocType 'Purchase Receipt Item'
-#. Option for the 'Update Price List Based On' (Select) field in DocType 'Stock
+#. Option for the 'Update Price List based on' (Select) field in DocType 'Stock
 #. Settings'
 #. Label of the rate (Currency) field in DocType 'Subcontracting Inward Order
 #. Received Item'
@@ -40819,6 +40955,7 @@ msgstr ""
 #: 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/manufacturing/doctype/work_order_additional_item/work_order_additional_item.json
 #: erpnext/manufacturing/doctype/work_order_item/work_order_item.json
 #: erpnext/public/js/utils.js:879
 #: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
@@ -40828,6 +40965,7 @@ msgstr ""
 #: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:41
 #: erpnext/stock/dashboard/item_dashboard.js:255
 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+#: erpnext/stock/doctype/item/item_prices.html:84
 #: erpnext/stock/doctype/item_price/item_price.json
 #: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
 #: erpnext/stock/doctype/material_request_item/material_request_item.json
@@ -41002,7 +41140,7 @@ msgstr ""
 msgid "Rate at which this tax is applied"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4089
+#: erpnext/controllers/accounts_controller.py:4094
 msgid "Rate of '{}' items cannot be changed"
 msgstr ""
 
@@ -41171,7 +41309,7 @@ msgstr ""
 msgid "Raw Materials Consumption"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:327
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:404
 msgid "Raw Materials Missing"
 msgstr ""
 
@@ -41221,7 +41359,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:767
+#: erpnext/manufacturing/doctype/work_order/work_order.js:779
 #: erpnext/selling/doctype/sales_order/sales_order.js:974
 #: erpnext/selling/doctype/sales_order/sales_order_list.js:70
 #: erpnext/stock/doctype/material_request/material_request.js:243
@@ -41558,7 +41696,7 @@ msgstr ""
 msgid "Recent Orders"
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_item_cart.js:913
+#: erpnext/selling/page/point_of_sale/pos_item_cart.js:924
 msgid "Recent Transactions"
 msgstr ""
 
@@ -41625,7 +41763,7 @@ msgstr ""
 msgid "Reconciled Entries"
 msgstr ""
 
-#. Option for the 'Posting Date Inheritance for Exchange Gain / Loss' (Select)
+#. Option for the 'Posting Date inheritance for exchange gain / loss' (Select)
 #. field in DocType 'Accounts Settings'
 #. Option for the 'Reconciliation Takes Effect On' (Select) field in DocType
 #. 'Company'
@@ -41648,12 +41786,6 @@ msgstr ""
 msgid "Reconciliation Progress"
 msgstr ""
 
-#. Label of the reconciliation_queue_size (Int) field in DocType 'Accounts
-#. Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Reconciliation Queue Size"
-msgstr ""
-
 #. Label of a Workspace Sidebar Item
 #: erpnext/workspace_sidebar/banking.json
 msgid "Reconciliation Statement"
@@ -41665,6 +41797,12 @@ msgstr ""
 msgid "Reconciliation Takes Effect On"
 msgstr ""
 
+#. Label of the reconciliation_queue_size (Int) field in DocType 'Accounts
+#. Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "Reconciliation queue size"
+msgstr ""
+
 #. Label of the recording_html (HTML) field in DocType 'Call Log'
 #: erpnext/telephony/doctype/call_log/call_log.json
 msgid "Recording HTML"
@@ -41768,7 +41906,7 @@ msgstr ""
 msgid "Reference #{0} dated {1}"
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:2797
+#: erpnext/public/js/controllers/transaction.js:2798
 msgid "Reference Date for Early Payment Discount"
 msgstr ""
 
@@ -41904,11 +42042,11 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:404
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:373
 msgid "References to Sales Invoices are Incomplete"
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:396
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:365
 msgid "References to Sales Orders are Incomplete"
 msgstr ""
 
@@ -42045,7 +42183,7 @@ msgstr ""
 msgid "Release Date"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:318
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:320
 msgid "Release date must be in the future"
 msgstr ""
 
@@ -42069,7 +42207,7 @@ msgid "Remaining Balance"
 msgstr ""
 
 #. Label of the remark (Small Text) field in DocType 'Journal Entry'
-#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655
+#: erpnext/accounts/doctype/journal_entry/journal_entry.js:657
 #: erpnext/accounts/doctype/journal_entry/journal_entry.json
 #: erpnext/selling/page/point_of_sale/pos_payment.js:489
 msgid "Remark"
@@ -42179,7 +42317,7 @@ msgstr ""
 msgid "Rename Log"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:556
+#: erpnext/accounts/doctype/account/account.py:557
 msgid "Rename Not Allowed"
 msgstr ""
 
@@ -42196,7 +42334,7 @@ msgstr ""
 msgid "Rename jobs for doctype {0} have not been enqueued."
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:548
+#: erpnext/accounts/doctype/account/account.py:549
 msgid "Renaming it is only allowed via parent company {0}, to avoid mismatch."
 msgstr ""
 
@@ -42564,8 +42702,8 @@ msgstr ""
 #: erpnext/buying/doctype/buying_settings/buying_settings.js:46
 #: erpnext/buying/doctype/buying_settings/buying_settings.json
 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:327
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:429
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:336
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:438
 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:88
 #: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:70
@@ -42794,9 +42932,9 @@ msgstr ""
 msgid "Reservation Based On"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:925
+#: erpnext/manufacturing/doctype/work_order/work_order.js:937
 #: erpnext/selling/doctype/sales_order/sales_order.js:107
-#: erpnext/stock/doctype/pick_list/pick_list.js:153
+#: erpnext/stock/doctype/pick_list/pick_list.js:158
 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:180
 msgid "Reserve"
 msgstr ""
@@ -42916,13 +43054,13 @@ 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:941
+#: erpnext/manufacturing/doctype/work_order/work_order.js:953
 #: erpnext/public/js/stock_reservation.js:236
 #: erpnext/selling/doctype/sales_order/sales_order.js:135
 #: erpnext/selling/doctype/sales_order/sales_order.js:465
 #: erpnext/stock/dashboard/item_dashboard_list.html:15
 #: erpnext/stock/doctype/bin/bin.json
-#: erpnext/stock/doctype/pick_list/pick_list.js:173
+#: erpnext/stock/doctype/pick_list/pick_list.js:178
 #: erpnext/stock/report/reserved_stock/reserved_stock.json
 #: erpnext/stock/report/stock_balance/stock_balance.py:572
 #: erpnext/stock/stock_ledger.py:2290
@@ -42977,7 +43115,7 @@ msgstr ""
 
 #: erpnext/public/js/stock_reservation.js:203
 #: erpnext/selling/doctype/sales_order/sales_order.js:418
-#: erpnext/stock/doctype/pick_list/pick_list.js:298
+#: erpnext/stock/doctype/pick_list/pick_list.js:306
 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:293
 msgid "Reserving Stock..."
 msgstr ""
@@ -43298,7 +43436,7 @@ msgstr ""
 msgid "Return Against Subcontracting Receipt"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:283
+#: erpnext/manufacturing/doctype/work_order/work_order.js:295
 msgid "Return Components"
 msgstr ""
 
@@ -43334,7 +43472,7 @@ msgstr ""
 msgid "Return Raw Material to Customer"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1524
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1555
 msgid "Return invoice of asset cancelled"
 msgstr ""
 
@@ -43354,7 +43492,7 @@ msgstr ""
 #. Option for the 'Tracking Status' (Select) field in DocType 'Shipment'
 #. Option for the 'Status' (Select) field in DocType 'Subcontracting Inward
 #. Order'
-#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:139
+#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:143
 #: erpnext/stock/doctype/shipment/shipment.json
 #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.json
 msgid "Returned"
@@ -43579,38 +43717,21 @@ msgstr ""
 msgid "Rod"
 msgstr ""
 
-#. Label of the role_allowed_to_create_edit_back_dated_transactions (Link)
-#. field in DocType 'Stock Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Role Allowed to Create/Edit Back-dated Transactions"
-msgstr ""
-
-#. Label of the stock_auth_role (Link) field in DocType 'Stock Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Role Allowed to Edit Frozen Stock"
-msgstr ""
-
-#. Label of the role_allowed_to_over_bill (Link) field in DocType 'Accounts
-#. Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Role Allowed to Over Bill "
-msgstr ""
-
 #. Label of the role_allowed_to_over_deliver_receive (Link) field in DocType
 #. 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "Role Allowed to Over Deliver/Receive"
 msgstr ""
 
-#. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts
+#. Label of the role_allowed_to_over_bill (Link) field in DocType 'Accounts
 #. Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Role Allowed to Override Stop Action"
+msgid "Role Allowed to over bill "
 msgstr ""
 
 #. Label of the credit_controller (Link) field in DocType 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Role allowed to bypass Credit Limit"
+msgid "Role allowed to bypass credit limit"
 msgstr ""
 
 #. Description of the 'Exempted Role' (Link) field in DocType 'Accounting
@@ -43619,10 +43740,24 @@ msgstr ""
 msgid "Role allowed to bypass period restrictions."
 msgstr ""
 
+#. Label of the role_allowed_to_create_edit_back_dated_transactions (Link)
+#. field in DocType 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Role allowed to create/edit back-dated transactions"
+msgstr ""
+
+#. Label of the stock_auth_role (Link) field in DocType 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Role allowed to edit frozen stock"
+msgstr ""
+
+#. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts
+#. Settings'
 #. Label of the role_to_override_stop_action (Link) field in DocType 'Buying
 #. Settings'
 #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling
 #. Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 #: erpnext/buying/doctype/buying_settings/buying_settings.json
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
 msgid "Role allowed to override stop action"
@@ -43719,7 +43854,7 @@ msgstr ""
 
 #. Label of the round_row_wise_tax (Check) field in DocType 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Round Tax Amount Row-wise"
+msgid "Round tax amount row-wise"
 msgstr ""
 
 #. Label of the rounded_total (Currency) field in DocType 'POS Invoice'
@@ -43870,17 +44005,17 @@ msgstr ""
 msgid "Row # {0}: Returned Item {1} does not exist in {2} {3}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:280
+#: erpnext/manufacturing/doctype/work_order/work_order.py:349
 msgid "Row #1: Sequence ID must be 1 for Operation {0}."
 msgstr ""
 
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:564
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2073
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2113
 msgid "Row #{0} (Payment Table): Amount must be negative"
 msgstr ""
 
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:562
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2068
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2108
 msgid "Row #{0} (Payment Table): Amount must be positive"
 msgstr ""
 
@@ -43896,12 +44031,12 @@ msgstr ""
 msgid "Row #{0}: Acceptance Criteria Formula is required."
 msgstr ""
 
-#: erpnext/controllers/subcontracting_controller.py:125
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:603
+#: erpnext/controllers/subcontracting_controller.py:126
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:600
 msgid "Row #{0}: Accepted Warehouse and Rejected Warehouse cannot be same"
 msgstr ""
 
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:596
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:593
 msgid "Row #{0}: Accepted Warehouse is mandatory for the accepted Item {1}"
 msgstr ""
 
@@ -43926,11 +44061,11 @@ msgstr ""
 msgid "Row #{0}: Amount must be a positive number"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:418
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:432
 msgid "Row #{0}: Asset {1} cannot be sold, it is already {2}"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:423
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:437
 msgid "Row #{0}: Asset {1} is already sold"
 msgstr ""
 
@@ -43970,27 +44105,27 @@ msgstr ""
 msgid "Row #{0}: Cannot create entry with different taxable AND withholding document links."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3792
+#: erpnext/controllers/accounts_controller.py:3797
 msgid "Row #{0}: Cannot delete item {1} which has already been billed."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3766
+#: erpnext/controllers/accounts_controller.py:3771
 msgid "Row #{0}: Cannot delete item {1} which has already been delivered"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3785
+#: erpnext/controllers/accounts_controller.py:3790
 msgid "Row #{0}: Cannot delete item {1} which has already been received"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3772
+#: erpnext/controllers/accounts_controller.py:3777
 msgid "Row #{0}: Cannot delete item {1} which has work order assigned to it."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3778
+#: erpnext/controllers/accounts_controller.py:3783
 msgid "Row #{0}: Cannot delete item {1} which is already ordered against this Sales Order."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4099
+#: erpnext/controllers/accounts_controller.py:4104
 msgid "Row #{0}: Cannot set Rate if the billed amount is greater than the amount for Item {1}."
 msgstr ""
 
@@ -44022,7 +44157,7 @@ msgstr ""
 msgid "Row #{0}: Consumed Asset {1} does not belong to company {2}"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.py:112
+#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.py:114
 msgid "Row #{0}: Cost Center {1} does not belong to company {2}"
 msgstr ""
 
@@ -44044,11 +44179,11 @@ msgstr ""
 msgid "Row #{0}: Customer Provided Item {1} cannot be added multiple times in the Subcontracting Inward process."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:357
+#: erpnext/manufacturing/doctype/work_order/work_order.py:426
 msgid "Row #{0}: Customer Provided Item {1} cannot be added multiple times."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:382
+#: erpnext/manufacturing/doctype/work_order/work_order.py:451
 msgid "Row #{0}: Customer Provided Item {1} does not exist in the Required Items table linked to the Subcontracting Inward Order."
 msgstr ""
 
@@ -44056,7 +44191,7 @@ msgstr ""
 msgid "Row #{0}: Customer Provided Item {1} exceeds quantity available through Subcontracting Inward Order"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:370
+#: erpnext/manufacturing/doctype/work_order/work_order.py:439
 msgid "Row #{0}: Customer Provided Item {1} has insufficient quantity in the Subcontracting Inward Order. Available quantity is {2}."
 msgstr ""
 
@@ -44112,11 +44247,11 @@ msgstr ""
 msgid "Row #{0}: Finished Good Item {1} must be a sub-contracted item"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:537
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:614
 msgid "Row #{0}: Finished Good must be {1}"
 msgstr ""
 
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:584
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:581
 msgid "Row #{0}: Finished Good reference is mandatory for Secondary Item {1}."
 msgstr ""
 
@@ -44149,7 +44284,7 @@ msgstr ""
 msgid "Row #{0}: Item added"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1644
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1721
 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}"
 msgstr ""
 
@@ -44226,7 +44361,7 @@ msgstr ""
 msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:962
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039
 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 ""
 
@@ -44235,11 +44370,11 @@ msgstr ""
 msgid "Row #{0}: Overconsumption of Customer Provided Item {1} against Work Order {2} is not allowed in the Subcontracting Inward process."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1056
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1054
 msgid "Row #{0}: Please select Item Code in Assembly Items"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1059
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1057
 msgid "Row #{0}: Please select the BOM No in Assembly Items"
 msgstr ""
 
@@ -44247,7 +44382,7 @@ msgstr ""
 msgid "Row #{0}: Please select the Finished Good Item against which this Customer Provided Item will be used."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1053
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1051
 msgid "Row #{0}: Please select the Sub Assembly Warehouse"
 msgstr ""
 
@@ -44324,11 +44459,11 @@ 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:577
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:574
 msgid "Row #{0}: Rejected Qty cannot be set for Secondary Item {1}."
 msgstr ""
 
-#: erpnext/controllers/subcontracting_controller.py:118
+#: erpnext/controllers/subcontracting_controller.py:119
 msgid "Row #{0}: Rejected Warehouse is mandatory for the rejected Item {1}"
 msgstr ""
 
@@ -44336,7 +44471,7 @@ msgstr ""
 msgid "Row #{0}: Repair cost {1} exceeds available amount {2} for Purchase Invoice {3} and Account {4}"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:426
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:440
 msgid "Row #{0}: Return Against is required for returning asset"
 msgstr ""
 
@@ -44348,11 +44483,11 @@ msgstr ""
 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:572
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:569
 msgid "Row #{0}: Secondary Item Qty cannot be zero"
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:296
+#: erpnext/controllers/selling_controller.py:297
 msgid ""
 "Row #{0}: Selling rate for item {1} is lower than its {2}.\n"
 "\t\t\t\t\tSelling {3} should be atleast {4}.<br><br>Alternatively,\n"
@@ -44360,7 +44495,7 @@ msgid ""
 "\t\t\t\t\tthis validation."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:286
+#: erpnext/manufacturing/doctype/work_order/work_order.py:355
 msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}."
 msgstr ""
 
@@ -44396,7 +44531,7 @@ msgstr ""
 msgid "Row #{0}: Set Supplier for item {1}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1063
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1061
 msgid "Row #{0}: Since 'Track Semi Finished Goods' is enabled, the BOM {1} cannot be used for Sub Assembly Items"
 msgstr ""
 
@@ -44404,19 +44539,19 @@ msgstr ""
 msgid "Row #{0}: Source Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:391
+#: erpnext/manufacturing/doctype/work_order/work_order.py:460
 msgid "Row #{0}: Source Warehouse {1} for item {2} cannot be a customer warehouse."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:346
+#: erpnext/manufacturing/doctype/work_order/work_order.py:415
 msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1109
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1186
 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1131
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1208
 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer"
 msgstr ""
 
@@ -44448,7 +44583,7 @@ msgstr ""
 msgid "Row #{0}: Stock is already reserved for the Item {1}."
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:558
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:527
 msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
 msgstr ""
 
@@ -44461,7 +44596,7 @@ msgstr ""
 msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1267
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1298
 msgid "Row #{0}: Stock quantity {1} ({2}) for item {3} cannot exceed {4}"
 msgstr ""
 
@@ -44505,7 +44640,7 @@ msgstr ""
 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries."
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:430
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:444
 msgid "Row #{0}: You must select an Asset for Item {1}."
 msgstr ""
 
@@ -44525,7 +44660,7 @@ msgstr ""
 msgid "Row #{0}: {1} of {2} should be {3}. Please update the {1} or select a different account."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3906
+#: erpnext/controllers/accounts_controller.py:3911
 msgid "Row #{0}:Quantity for Item {1} cannot be zero."
 msgstr ""
 
@@ -44541,7 +44676,7 @@ msgstr ""
 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer."
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:1071
+#: erpnext/controllers/buying_controller.py:1058
 msgid "Row #{idx}: Please enter a location for the asset item {item_code}."
 msgstr ""
 
@@ -44561,7 +44696,7 @@ msgstr ""
 msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same."
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:1188
+#: erpnext/controllers/buying_controller.py:1175
 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}."
 msgstr ""
 
@@ -44613,7 +44748,7 @@ msgstr ""
 msgid "Row #{}: You cannot add positive quantities in a return invoice. Please remove item {} to complete the return."
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:234
+#: erpnext/stock/doctype/pick_list/pick_list.py:237
 msgid "Row #{}: item {} has been picked already."
 msgstr ""
 
@@ -44630,7 +44765,7 @@ msgstr ""
 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}."
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:441
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:435
 msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}"
 msgstr ""
 
@@ -44638,15 +44773,15 @@ msgstr ""
 msgid "Row {0} : Operation is required against the raw material item {1}"
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:264
+#: erpnext/stock/doctype/pick_list/pick_list.py:267
 msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1668
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1745
 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}"
 msgstr ""
 
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:276
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:273
 msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
 msgstr ""
 
@@ -44674,7 +44809,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:1329
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1406
 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials."
 msgstr ""
 
@@ -44686,17 +44821,21 @@ msgstr ""
 msgid "Row {0}: Both Debit and Credit values cannot be zero"
 msgstr ""
 
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:619
+#: erpnext/controllers/selling_controller.py:909
+msgid "Row {0}: Cannot sell item {1} from Sample Retention Warehouse {2}"
+msgstr ""
+
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:616
 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."
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:288
+#: erpnext/controllers/selling_controller.py:289
 msgid "Row {0}: Conversion Factor is mandatory"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3243
+#: erpnext/controllers/accounts_controller.py:3238
 msgid "Row {0}: Cost Center {1} does not belong to Company {2}"
 msgstr ""
 
@@ -44716,15 +44855,15 @@ msgstr ""
 msgid "Row {0}: Debit entry can not be linked with a {1}"
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:880
+#: erpnext/controllers/selling_controller.py:879
 msgid "Row {0}: Delivery Warehouse ({1}) and Customer Warehouse ({2}) can not be same"
 msgstr ""
 
-#: erpnext/controllers/subcontracting_controller.py:158
+#: erpnext/controllers/subcontracting_controller.py:159
 msgid "Row {0}: Delivery Warehouse cannot be same as Customer Warehouse for Item {1}."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2736
+#: erpnext/controllers/accounts_controller.py:2738
 msgid "Row {0}: Due Date in the Payment Terms table cannot be before Posting Date"
 msgstr ""
 
@@ -44733,7 +44872,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory.
 msgstr ""
 
 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
-#: erpnext/controllers/taxes_and_totals.py:1378
+#: erpnext/controllers/taxes_and_totals.py:1391
 msgid "Row {0}: Exchange Rate is mandatory"
 msgstr ""
 
@@ -44749,19 +44888,19 @@ msgstr ""
 msgid "Row {0}: Expense Account {1} is linked to company {2}. Please select an account belonging to company {3}."
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:531
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:525
 msgid "Row {0}: Expense Head changed to {1} as no Purchase Receipt is created against Item {2}."
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:488
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:482
 msgid "Row {0}: Expense Head changed to {1} because account {2} is not linked to warehouse {3} or it is not the default inventory account"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:513
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:507
 msgid "Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}"
 msgstr ""
 
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:155
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:156
 msgid "Row {0}: For Supplier {1}, Email Address is Required to send an email"
 msgstr ""
 
@@ -44794,23 +44933,23 @@ msgstr ""
 msgid "Row {0}: Item Tax template updated as per validity and rate applied"
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:645
+#: erpnext/controllers/selling_controller.py:644
 msgid "Row {0}: Item rate has been updated as per valuation rate since its an internal stock transfer"
 msgstr ""
 
-#: erpnext/controllers/subcontracting_controller.py:151
+#: erpnext/controllers/subcontracting_controller.py:152
 msgid "Row {0}: Item {1} must be a stock item."
 msgstr ""
 
-#: erpnext/controllers/subcontracting_controller.py:166
+#: erpnext/controllers/subcontracting_controller.py:167
 msgid "Row {0}: Item {1} must be a subcontracted item."
 msgstr ""
 
-#: erpnext/controllers/subcontracting_controller.py:183
+#: erpnext/controllers/subcontracting_controller.py:184
 msgid "Row {0}: Item {1} must be linked to a {2}."
 msgstr ""
 
-#: erpnext/controllers/subcontracting_controller.py:204
+#: erpnext/controllers/subcontracting_controller.py:205
 msgid "Row {0}: Item {1}'s quantity cannot be higher than the available quantity."
 msgstr ""
 
@@ -44818,7 +44957,7 @@ msgstr ""
 msgid "Row {0}: Operation time should be greater than 0 for operation {1}"
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:615
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:584
 msgid "Row {0}: Packed Qty must be equal to {1} Qty."
 msgstr ""
 
@@ -44850,15 +44989,15 @@ msgstr ""
 msgid "Row {0}: Please provide a valid Delivery Note Item or Packed Item reference."
 msgstr ""
 
-#: erpnext/controllers/subcontracting_controller.py:229
+#: erpnext/controllers/subcontracting_controller.py:230
 msgid "Row {0}: Please select a BOM for Item {1}."
 msgstr ""
 
-#: erpnext/controllers/subcontracting_controller.py:217
+#: erpnext/controllers/subcontracting_controller.py:218
 msgid "Row {0}: Please select an active BOM for Item {1}."
 msgstr ""
 
-#: erpnext/controllers/subcontracting_controller.py:223
+#: erpnext/controllers/subcontracting_controller.py:224
 msgid "Row {0}: Please select an valid BOM for Item {1}."
 msgstr ""
 
@@ -44886,7 +45025,7 @@ msgstr ""
 msgid "Row {0}: Qty cannot be greater than {1} for the Item {2}."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:628
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:705
 msgid "Row {0}: Qty in Stock UOM can not be zero."
 msgstr ""
 
@@ -44898,19 +45037,23 @@ msgstr ""
 msgid "Row {0}: Quantity cannot be negative."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1036
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1113
 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:885
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:916
 msgid "Row {0}: Sales Invoice {1} is already created for {2}"
 msgstr ""
 
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:317
+msgid "Row {0}: Serial/Batch has been reset to values linked with Work Order {1} because the previously selected serial/batch does not belong to this Work Order."
+msgstr ""
+
 #: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:58
 msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1681
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758
 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
 msgstr ""
 
@@ -44926,11 +45069,11 @@ msgstr ""
 msgid "Row {0}: The entire expense amount for account {1} in {2} has already been allocated."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:674
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:751
 msgid "Row {0}: The item {1}, quantity must be positive number"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3220
+#: erpnext/controllers/accounts_controller.py:3215
 msgid "Row {0}: The {3} Account {1} does not belong to the company {2}"
 msgstr ""
 
@@ -44938,24 +45081,28 @@ 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:3605
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:3687
 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:622
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:699
 msgid "Row {0}: UOM Conversion Factor is mandatory"
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:170
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:401
+msgid "Row {0}: Update Stock must be checked for item {1} because it is against Pick List {2}."
+msgstr ""
+
+#: erpnext/stock/doctype/pick_list/pick_list.py:173
 msgid "Row {0}: Warehouse is required"
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:179
+#: erpnext/stock/doctype/pick_list/pick_list.py:182
 msgid "Row {0}: Warehouse {1} is linked to company {2}. Please select a warehouse belonging to company {3}."
 msgstr ""
 
 #: erpnext/manufacturing/doctype/bom/bom.py:1239
-#: erpnext/manufacturing/doctype/work_order/work_order.py:420
+#: erpnext/manufacturing/doctype/work_order/work_order.py:489
 msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
 msgstr ""
 
@@ -44991,7 +45138,7 @@ msgstr ""
 msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}."
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:1053
+#: erpnext/controllers/buying_controller.py:1040
 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}."
 msgstr ""
 
@@ -45011,13 +45158,13 @@ msgstr ""
 msgid "Rows Removed in {0}"
 msgstr ""
 
-#. Description of the 'Merge Similar Account Heads' (Check) field in DocType
+#. Description of the 'Merge similar Account Heads' (Check) field in DocType
 #. 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 msgid "Rows with Same Account heads will be merged on Ledger"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2747
+#: erpnext/controllers/accounts_controller.py:2749
 msgid "Rows with duplicate due dates in other rows were found: {0}"
 msgstr ""
 
@@ -45054,24 +45201,6 @@ msgstr ""
 msgid "Run parallel job cards in a workstation"
 msgstr ""
 
-#. Option for the 'Status' (Select) field in DocType 'Process Payment
-#. Reconciliation'
-#. Option for the 'Status' (Select) field in DocType 'Process Payment
-#. Reconciliation Log'
-#. Option for the 'Status' (Select) field in DocType 'Process Period Closing
-#. Voucher'
-#. Option for the 'Status' (Select) field in DocType 'Process Period Closing
-#. Voucher Detail'
-#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
-#. Record'
-#: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json
-#: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json
-#: erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.json
-#: erpnext/accounts/doctype/process_period_closing_voucher_detail/process_period_closing_voucher_detail.json
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json
-msgid "Running"
-msgstr ""
-
 #: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:28
 msgid "S.O. No."
 msgstr ""
@@ -45206,7 +45335,7 @@ msgstr ""
 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:297
 #: erpnext/stock/doctype/item/item.json
 #: erpnext/stock/doctype/item/item_list.js:29
-#: erpnext/stock/doctype/pick_list/pick_list_dashboard.py:16
+#: erpnext/stock/doctype/pick_list/pick_list_dashboard.py:17
 msgid "Sales"
 msgstr ""
 
@@ -45300,6 +45429,7 @@ msgstr ""
 #. Option for the 'Reference Type' (Select) field in DocType 'Quality
 #. Inspection'
 #. Label of a Workspace Sidebar Item
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.js:63
 #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
 #: erpnext/accounts/doctype/loyalty_point_entry_redemption/loyalty_point_entry_redemption.json
 #: erpnext/accounts/doctype/overdue_payment/overdue_payment.json
@@ -45323,6 +45453,7 @@ msgstr ""
 #: erpnext/setup/workspace/home/home.json
 #: erpnext/stock/doctype/delivery_note/delivery_note.js:347
 #: erpnext/stock/doctype/delivery_note/delivery_note_list.js:67
+#: erpnext/stock/doctype/pick_list/pick_list.js:142
 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json
 #: erpnext/workspace_sidebar/home.json erpnext/workspace_sidebar/invoicing.json
 #: erpnext/workspace_sidebar/selling.json
@@ -45408,7 +45539,7 @@ msgstr ""
 msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:635
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:597
 msgid "Sales Invoice {0} has already been submitted"
 msgstr ""
 
@@ -45470,7 +45601,7 @@ msgstr ""
 #: erpnext/accounts/report/sales_register/sales_register.py:238
 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
 #: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
-#: erpnext/controllers/selling_controller.py:495
+#: erpnext/controllers/selling_controller.py:494
 #: erpnext/crm/doctype/contract/contract.json
 #: erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js:65
 #: erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
@@ -45615,24 +45746,19 @@ msgstr ""
 msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:1814
-#: erpnext/selling/doctype/sales_order/sales_order.py:1827
+#: erpnext/selling/doctype/sales_order/sales_order.py:1815
+#: erpnext/selling/doctype/sales_order/sales_order.py:1828
 msgid "Sales Order {0} is not available for production"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1397
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1428
 msgid "Sales Order {0} is not submitted"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:496
+#: erpnext/manufacturing/doctype/work_order/work_order.py:565
 msgid "Sales Order {0} is not valid"
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:476
-#: erpnext/manufacturing/doctype/work_order/work_order.py:501
-msgid "Sales Order {0} is {1}"
-msgstr ""
-
 #. Label of the sales_orders (Table) field in DocType 'Master Production
 #. Schedule'
 #. Label of the sales_orders_detail (Section Break) field in DocType
@@ -45646,7 +45772,7 @@ msgstr ""
 msgid "Sales Orders"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:344
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:345
 msgid "Sales Orders Required"
 msgstr ""
 
@@ -45812,7 +45938,7 @@ msgstr ""
 msgid "Sales Person"
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:270
+#: erpnext/controllers/selling_controller.py:271
 msgid "Sales Person <b>{0}</b> is disabled."
 msgstr ""
 
@@ -45995,7 +46121,7 @@ msgstr ""
 msgid "Sales and Returns"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:217
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:218
 msgid "Sales orders are not available for production"
 msgstr ""
 
@@ -46031,7 +46157,7 @@ msgstr ""
 msgid "Same item cannot be entered multiple times."
 msgstr ""
 
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:124
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:125
 msgid "Same supplier has been entered multiple times"
 msgstr ""
 
@@ -46055,12 +46181,12 @@ msgstr ""
 
 #. Label of the sample_size (Float) field in DocType 'Quality Inspection'
 #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:93
-#: erpnext/public/js/controllers/transaction.js:2854
+#: erpnext/public/js/controllers/transaction.js:2855
 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json
 msgid "Sample Size"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:4103
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:4185
 msgid "Sample quantity {0} cannot be more than received quantity {1}"
 msgstr ""
 
@@ -46161,7 +46287,7 @@ msgstr ""
 msgid "Schedule Date"
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:492
+#: erpnext/public/js/controllers/transaction.js:495
 msgid "Schedule Name"
 msgstr ""
 
@@ -46190,7 +46316,7 @@ msgstr ""
 msgid "Scheduler is Inactive. Can't trigger job now."
 msgstr ""
 
-#: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py:240
+#: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py:237
 msgid "Scheduler is Inactive. Can't trigger jobs now."
 msgstr ""
 
@@ -46322,7 +46448,7 @@ msgstr ""
 msgid "Search by invoice id or customer name"
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_item_selector.js:205
+#: erpnext/selling/page/point_of_sale/pos_item_selector.js:229
 msgid "Search by item code, serial number or barcode"
 msgstr ""
 
@@ -46357,6 +46483,16 @@ msgstr ""
 msgid "Secondary Items"
 msgstr ""
 
+#. Label of the secondary_items (Table) field in DocType 'Work Order'
+#: erpnext/manufacturing/doctype/work_order/work_order.js:136
+#: erpnext/manufacturing/doctype/work_order/work_order.json
+msgid "Secondary Items (as per BOM)"
+msgstr ""
+
+#: erpnext/manufacturing/doctype/work_order/work_order.js:135
+msgid "Secondary Items (as per Manufacture Entries)"
+msgstr ""
+
 #. Label of the secondary_items_cost (Currency) field in DocType 'BOM'
 #: erpnext/manufacturing/doctype/bom/bom.json
 msgid "Secondary Items Cost"
@@ -46427,7 +46563,7 @@ msgstr ""
 msgid "Select Alternative Items for Sales Order"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:801
+#: erpnext/stock/doctype/item/item.js:838
 msgid "Select Attribute Values"
 msgstr ""
 
@@ -46441,7 +46577,7 @@ msgstr ""
 
 #: erpnext/assets/doctype/asset_repair/asset_repair.js:234
 #: erpnext/public/js/utils/sales_common.js:443
-#: erpnext/stock/doctype/pick_list/pick_list.js:390
+#: erpnext/stock/doctype/pick_list/pick_list.js:398
 msgid "Select Batch No"
 msgstr ""
 
@@ -46530,7 +46666,7 @@ msgstr ""
 msgid "Select Items based on Delivery Date"
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:2893
+#: erpnext/public/js/controllers/transaction.js:2894
 msgid "Select Items for Quality Inspection"
 msgstr ""
 
@@ -46556,11 +46692,11 @@ msgid "Select Job Worker Address"
 msgstr ""
 
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1203
-#: erpnext/selling/page/point_of_sale/pos_item_cart.js:955
+#: erpnext/selling/page/point_of_sale/pos_item_cart.js:966
 msgid "Select Loyalty Program"
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:478
+#: erpnext/public/js/controllers/transaction.js:481
 msgid "Select Payment Schedule"
 msgstr ""
 
@@ -46568,20 +46704,20 @@ msgstr ""
 msgid "Select Possible Supplier"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1104
-#: erpnext/stock/doctype/pick_list/pick_list.js:219
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1116
+#: erpnext/stock/doctype/pick_list/pick_list.js:224
 msgid "Select Quantity"
 msgstr ""
 
 #: erpnext/assets/doctype/asset_repair/asset_repair.js:234
 #: erpnext/public/js/utils/sales_common.js:443
-#: erpnext/stock/doctype/pick_list/pick_list.js:390
+#: erpnext/stock/doctype/pick_list/pick_list.js:398
 msgid "Select Serial No"
 msgstr ""
 
 #: erpnext/assets/doctype/asset_repair/asset_repair.js:237
 #: erpnext/public/js/utils/sales_common.js:446
-#: erpnext/stock/doctype/pick_list/pick_list.js:393
+#: erpnext/stock/doctype/pick_list/pick_list.js:401
 msgid "Select Serial and Batch"
 msgstr ""
 
@@ -46651,7 +46787,7 @@ msgstr ""
 msgid "Select a company"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:1137
+#: erpnext/stock/doctype/item/item.js:1180
 msgid "Select an Item Group."
 msgstr ""
 
@@ -46667,7 +46803,7 @@ msgstr ""
 msgid "Select an item from each set to be used in the Sales Order."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:815
+#: erpnext/stock/doctype/item/item.js:852
 msgid "Select at least one attribute value."
 msgstr ""
 
@@ -46681,11 +46817,11 @@ msgstr ""
 msgid "Select company name first."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2995
+#: erpnext/controllers/accounts_controller.py:2990
 msgid "Select finance book for the item {0} at row {1}"
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_item_selector.js:215
+#: erpnext/selling/page/point_of_sale/pos_item_selector.js:239
 msgid "Select item group"
 msgstr ""
 
@@ -46702,7 +46838,7 @@ 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:1206
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1218
 msgid "Select the Item to be manufactured."
 msgstr ""
 
@@ -46735,7 +46871,7 @@ msgstr ""
 msgid "Select variant item code for the template item {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.js:707
+#: erpnext/manufacturing/doctype/production_plan/production_plan.js:708
 msgid ""
 "Select whether to get items from a Sales Order or a Material Request. For now select <b>Sales Order</b>.\n"
 " A Production Plan can also be created manually where you can select the Items to manufacture."
@@ -46755,7 +46891,7 @@ msgstr ""
 msgid "Selected POS Opening Entry should be open."
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2569
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2609
 msgid "Selected Price List should have buying and selling fields checked."
 msgstr ""
 
@@ -46805,7 +46941,7 @@ msgstr ""
 msgid "Sell quantity cannot exceed the asset quantity"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1410
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1441
 msgid "Sell quantity cannot exceed the asset quantity. Asset {0} has only {1} item(s)."
 msgstr ""
 
@@ -46836,6 +46972,7 @@ msgstr ""
 #: erpnext/selling/workspace/selling/selling.json
 #: erpnext/setup/doctype/incoterm/incoterm.json
 #: erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
+#: erpnext/stock/doctype/item/item_prices.html:100
 #: erpnext/stock/doctype/item_price/item_price.json
 #: erpnext/stock/doctype/price_list/price_list.json
 #: erpnext/workspace_sidebar/selling.json
@@ -46920,7 +47057,7 @@ msgid "Send Emails to Suppliers"
 msgstr ""
 
 #. Label of the send_sms (Button) field in DocType 'SMS Center'
-#: erpnext/public/js/controllers/transaction.js:697
+#: erpnext/public/js/controllers/transaction.js:700
 #: erpnext/selling/doctype/sms_center/sms_center.json
 msgid "Send SMS"
 msgstr ""
@@ -46974,12 +47111,6 @@ msgstr ""
 msgid "Serial & Batch Item"
 msgstr ""
 
-#. Label of the section_break_7 (Section Break) field in DocType 'Stock
-#. Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Serial & Batch Item Settings"
-msgstr ""
-
 #. Label of the section_break_jcmx (Section Break) field in DocType 'Job Card'
 #: erpnext/manufacturing/doctype/job_card/job_card.json
 msgid "Serial / Batch"
@@ -47008,6 +47139,12 @@ msgstr ""
 msgid "Serial / Batch Nos"
 msgstr ""
 
+#. Label of the section_break_7 (Section Break) field in DocType 'Stock
+#. Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Serial Item settings"
+msgstr ""
+
 #. Label of the serial_no (Text) field in DocType 'POS Invoice Item'
 #. Label of the serial_no (Text) field in DocType 'Purchase Invoice Item'
 #. Label of the serial_no (Text) field in DocType 'Sales Invoice Item'
@@ -47056,7 +47193,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:2867
+#: erpnext/public/js/controllers/transaction.js:2868
 #: erpnext/public/js/utils/serial_no_batch_selector.js:432
 #: erpnext/selling/doctype/installation_note_item/installation_note_item.json
 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -47096,7 +47233,7 @@ msgstr ""
 msgid "Serial No / Batch"
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:106
+#: erpnext/controllers/selling_controller.py:107
 msgid "Serial No Already Assigned"
 msgstr ""
 
@@ -47117,7 +47254,7 @@ msgstr ""
 msgid "Serial No Range"
 msgstr ""
 
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2672
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2653
 msgid "Serial No Reserved"
 msgstr ""
 
@@ -47161,7 +47298,7 @@ msgstr ""
 msgid "Serial No and Batch"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_settings/stock_settings.js:34
+#: erpnext/stock/doctype/stock_settings/stock_settings.js:93
 msgid "Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled."
 msgstr ""
 
@@ -47203,7 +47340,7 @@ msgstr ""
 msgid "Serial No {0} does not exist"
 msgstr ""
 
-#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3461
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3442
 msgid "Serial No {0} does not exists"
 msgstr ""
 
@@ -47215,7 +47352,7 @@ msgstr ""
 msgid "Serial No {0} is already added"
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:103
+#: erpnext/controllers/selling_controller.py:104
 msgid "Serial No {0} is already assigned to customer {1}. Can only be returned against the customer {1}"
 msgstr ""
 
@@ -47310,6 +47447,8 @@ msgstr ""
 #. Detail'
 #. Label of the serial_and_batch_bundle (Link) field in DocType 'Stock Ledger
 #. Entry'
+#. Label of the auto_bundle_section (Section Break) field in DocType 'Stock
+#. Settings'
 #. Label of the serial_and_batch_bundle (Link) field in DocType 'Subcontracting
 #. Receipt Item'
 #. Label of a Workspace Sidebar Item
@@ -47328,6 +47467,8 @@ msgstr ""
 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
 #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+#: erpnext/stock/doctype/stock_settings/stock_settings.js:156
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
 #: erpnext/stock/report/available_serial_no/available_serial_no.py:188
 #: erpnext/stock/report/incorrect_serial_and_batch_bundle/incorrect_serial_and_batch_bundle.py:31
 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:80
@@ -47382,7 +47523,7 @@ msgstr ""
 msgid "Serial and Batch Nos"
 msgstr ""
 
-#. Description of the 'Auto Reserve Serial and Batch Nos' (Check) field in
+#. Description of the 'Auto reserve Serial and Batch Nos' (Check) field in
 #. DocType 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "Serial and Batch Nos will be auto-reserved based on <b>Pick Serial / Batch Based On</b>"
@@ -47406,7 +47547,7 @@ msgstr ""
 msgid "Serial number {0} entered more than once"
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_item_details.js:449
+#: erpnext/selling/page/point_of_sale/pos_item_details.js:451
 msgid "Serial numbers unavailable for Item {0} under warehouse {1}. Please try changing warehouse."
 msgstr ""
 
@@ -47468,7 +47609,7 @@ msgstr ""
 #: erpnext/accounts/doctype/budget/budget.json
 #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json
 #: erpnext/accounts/doctype/dunning/dunning.json
-#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659
+#: erpnext/accounts/doctype/journal_entry/journal_entry.js:661
 #: erpnext/accounts/doctype/journal_entry/journal_entry.json
 #: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json
 #: erpnext/accounts/doctype/payment_entry/payment_entry.json
@@ -47716,12 +47857,12 @@ msgid "Service Stop Date"
 msgstr ""
 
 #: erpnext/accounts/deferred_revenue.py:45
-#: erpnext/public/js/controllers/transaction.js:1776
+#: erpnext/public/js/controllers/transaction.js:1777
 msgid "Service Stop Date cannot be after Service End Date"
 msgstr ""
 
 #: erpnext/accounts/deferred_revenue.py:42
-#: erpnext/public/js/controllers/transaction.js:1773
+#: erpnext/public/js/controllers/transaction.js:1774
 msgid "Service Stop Date cannot be before Service Start Date"
 msgstr ""
 
@@ -47745,7 +47886,7 @@ msgstr ""
 
 #. Label of the set_basic_rate_manually (Check) field in DocType 'Stock Entry
 #. Detail'
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:307
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:384
 #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
 msgid "Set Basic Rate Manually"
 msgstr ""
@@ -47964,7 +48105,7 @@ msgstr ""
 msgid "Set targets Item Group-wise for this Sales Person."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1263
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1275
 msgid "Set the Planned Start Date (an Estimated Date at which you want the Production to begin)"
 msgstr ""
 
@@ -48066,7 +48207,7 @@ msgid "Setting up company"
 msgstr ""
 
 #: erpnext/manufacturing/doctype/bom/bom.py:1218
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1498
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1562
 msgid "Setting {0} is required"
 msgstr ""
 
@@ -48201,7 +48342,7 @@ msgstr ""
 msgid "Shelf Life In Days"
 msgstr ""
 
-#: erpnext/stock/doctype/batch/batch.py:215
+#: erpnext/stock/doctype/batch/batch.py:214
 msgid "Shelf Life in Days"
 msgstr ""
 
@@ -48278,7 +48419,7 @@ msgstr ""
 msgid "Shipment details"
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:806
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:768
 msgid "Shipments"
 msgstr ""
 
@@ -48473,17 +48614,6 @@ msgstr ""
 msgid "Show Aggregate Value from Subsidiary Companies"
 msgstr ""
 
-#. Label of the show_balance_in_coa (Check) field in DocType 'Accounts
-#. Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Show Balances in Chart Of Accounts"
-msgstr ""
-
-#. Label of the show_barcode_field (Check) field in DocType 'Stock Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Show Barcode Field in Stock Transactions"
-msgstr ""
-
 #: erpnext/accounts/report/general_ledger/general_ledger.js:199
 msgid "Show Cancelled Entries"
 msgstr ""
@@ -48496,7 +48626,7 @@ msgstr ""
 msgid "Show Credit / Debit in Company Currency"
 msgstr ""
 
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:106
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:109
 msgid "Show Cumulative Amount"
 msgstr ""
 
@@ -48542,12 +48672,6 @@ msgstr ""
 msgid "Show In Website"
 msgstr ""
 
-#. Label of the show_inclusive_tax_in_print (Check) field in DocType 'Accounts
-#. Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Show Inclusive Tax in Print"
-msgstr ""
-
 #: erpnext/stock/report/available_batch_report/available_batch_report.js:86
 msgid "Show Item Name"
 msgstr ""
@@ -48603,7 +48727,7 @@ msgstr ""
 #. Label of the show_payment_schedule_in_print (Check) field in DocType
 #. 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Show Payment Schedule in Print"
+msgid "Show Payment Schedule in print"
 msgstr ""
 
 #. Label of the show_remarks (Check) field in DocType 'Process Statement Of
@@ -48628,12 +48752,6 @@ msgstr ""
 msgid "Show Stock Ageing Data"
 msgstr ""
 
-#. Label of the show_taxes_as_table_in_print (Check) field in DocType 'Accounts
-#. Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Show Taxes as Table in Print"
-msgstr ""
-
 #: erpnext/stock/report/stock_balance/stock_balance.js:115
 msgid "Show Variant Attributes"
 msgstr ""
@@ -48650,6 +48768,17 @@ msgstr ""
 msgid "Show availability of exploded items"
 msgstr ""
 
+#. Label of the show_balance_in_coa (Check) field in DocType 'Accounts
+#. Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "Show balances in Chart of Accounts"
+msgstr ""
+
+#. Label of the show_barcode_field (Check) field in DocType 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Show barcode field in stock transactions"
+msgstr ""
+
 #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.js:88
 msgid "Show in Bucket View"
 msgstr ""
@@ -48659,6 +48788,12 @@ msgstr ""
 msgid "Show in Website"
 msgstr ""
 
+#. Label of the show_inclusive_tax_in_print (Check) field in DocType 'Accounts
+#. Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "Show inclusive tax in print"
+msgstr ""
+
 #. Description of the 'Reverse Sign' (Check) field in DocType 'Financial Report
 #. Row'
 #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json
@@ -48687,6 +48822,12 @@ msgstr ""
 msgid "Show pending entries"
 msgstr ""
 
+#. Label of the show_taxes_as_table_in_print (Check) field in DocType 'Accounts
+#. Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "Show taxes as table in print"
+msgstr ""
+
 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:80
 #: erpnext/accounts/report/trial_balance/trial_balance.js:100
 msgid "Show unclosed fiscal year's P&L balances"
@@ -48781,7 +48922,7 @@ msgstr ""
 msgid "Simultaneous"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:752
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:829
 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 ""
 
@@ -48819,7 +48960,7 @@ msgstr ""
 
 #. Label of the skip_material_transfer (Check) field in DocType 'Work Order
 #. Operation'
-#: erpnext/manufacturing/doctype/work_order/work_order.js:361
+#: erpnext/manufacturing/doctype/work_order/work_order.js:373
 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
 #: erpnext/manufacturing/doctype/workstation/workstation.js:454
 msgid "Skip Material Transfer"
@@ -48877,7 +49018,7 @@ msgstr ""
 msgid "Sold"
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:89
+#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:93
 msgid "Sold by"
 msgstr ""
 
@@ -48886,7 +49027,7 @@ msgstr ""
 msgid "Solvency Ratios"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4359
+#: erpnext/controllers/accounts_controller.py:4364
 msgid "Some required Company details are missing. You don't have permission to update them. Please contact your System Manager."
 msgstr ""
 
@@ -48950,7 +49091,7 @@ msgstr ""
 msgid "Source Location"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1014
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1026
 msgid "Source Manufacture Entry"
 msgstr ""
 
@@ -48959,11 +49100,11 @@ msgstr ""
 msgid "Source Stock Entry (Manufacture)"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:914
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:991
 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2380
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:2457
 msgid "Source Stock Entry {0} has no finished goods quantity"
 msgstr ""
 
@@ -49021,7 +49162,7 @@ msgstr ""
 msgid "Source Warehouse is mandatory for the Item {0}."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:305
+#: erpnext/manufacturing/doctype/work_order/work_order.py:374
 msgid "Source Warehouse {0} must be same as Customer Warehouse {1} in the Subcontracting Inward Order."
 msgstr ""
 
@@ -49029,7 +49170,7 @@ msgstr ""
 msgid "Source and Target Location cannot be same"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:880
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:957
 msgid "Source and target warehouse cannot be same for row {0}"
 msgstr ""
 
@@ -49042,9 +49183,9 @@ msgstr ""
 msgid "Source of Funds (Liabilities)"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:847
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:863
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:870
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:924
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:940
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:947
 msgid "Source warehouse is mandatory for row {0}"
 msgstr ""
 
@@ -49102,7 +49243,7 @@ msgstr ""
 msgid "Split Batch"
 msgstr ""
 
-#. Description of the 'Book Tax Loss on Early Payment Discount' (Check) field
+#. Description of the 'Book tax loss on early payment discount' (Check) field
 #. in DocType 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 msgid "Split Early Payment Discount Loss into Income and Tax Loss"
@@ -49169,11 +49310,6 @@ msgstr ""
 msgid "Square Yard"
 msgstr ""
 
-#. Label of the stage (Data) field in DocType 'Prospect Opportunity'
-#: erpnext/crm/doctype/prospect_opportunity/prospect_opportunity.json
-msgid "Stage"
-msgstr ""
-
 #. Label of the stage_name (Data) field in DocType 'Sales Stage'
 #: erpnext/crm/doctype/sales_stage/sales_stage.json
 msgid "Stage Name"
@@ -49403,8 +49539,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:1365
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1391
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1384
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1410
 #: erpnext/accounts/report/account_balance/account_balance.js:58
 msgid "Stock Adjustment"
 msgstr ""
@@ -49511,7 +49647,7 @@ msgstr ""
 msgid "Stock Details"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1004
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1081
 msgid "Stock Entries already created for Work Order {0}: {1}"
 msgstr ""
 
@@ -49532,10 +49668,11 @@ msgstr ""
 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
 #: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
 #: erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json
-#: erpnext/stock/doctype/pick_list/pick_list.js:143
+#: erpnext/stock/doctype/pick_list/pick_list.js:148
 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json
 #: erpnext/stock/doctype/stock_entry/stock_entry.json
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
+#: erpnext/stock/doctype/stock_settings/stock_settings.js:150
 #: erpnext/stock/workspace/stock/stock.json
 #: erpnext/workspace_sidebar/manufacturing.json
 #: erpnext/workspace_sidebar/stock.json
@@ -49570,7 +49707,7 @@ msgstr ""
 msgid "Stock Entry Type"
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:1510
+#: erpnext/stock/doctype/pick_list/pick_list.py:1552
 msgid "Stock Entry has been already created against this Pick List"
 msgstr ""
 
@@ -49582,7 +49719,7 @@ msgstr ""
 msgid "Stock Entry {0} has created"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1316
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1320
 msgid "Stock Entry {0} is not submitted"
 msgstr ""
 
@@ -49591,11 +49728,6 @@ msgstr ""
 msgid "Stock Expenses"
 msgstr ""
 
-#. Label of the stock_frozen_upto (Date) field in DocType 'Stock Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Stock Frozen Up To"
-msgstr ""
-
 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:37
 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:60
 msgid "Stock In Hand"
@@ -49784,6 +49916,7 @@ msgstr ""
 #: erpnext/setup/workspace/home/home.json
 #: erpnext/stock/doctype/item/item.py:668
 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
+#: erpnext/stock/doctype/stock_settings/stock_settings.js:155
 #: erpnext/stock/workspace/stock/stock.json
 #: erpnext/workspace_sidebar/stock.json
 msgid "Stock Reconciliation"
@@ -49819,18 +49952,18 @@ 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:927
-#: erpnext/manufacturing/doctype/work_order/work_order.js:936
-#: erpnext/manufacturing/doctype/work_order/work_order.js:943
+#: erpnext/manufacturing/doctype/work_order/work_order.js:939
+#: erpnext/manufacturing/doctype/work_order/work_order.js:948
+#: erpnext/manufacturing/doctype/work_order/work_order.js:955
 #: 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:109
 #: erpnext/selling/doctype/sales_order/sales_order.js:124
 #: erpnext/selling/doctype/sales_order/sales_order.js:137
 #: erpnext/selling/doctype/sales_order/sales_order.js:258
-#: erpnext/stock/doctype/pick_list/pick_list.js:155
-#: erpnext/stock/doctype/pick_list/pick_list.js:170
+#: erpnext/stock/doctype/pick_list/pick_list.js:160
 #: erpnext/stock/doctype/pick_list/pick_list.js:175
+#: erpnext/stock/doctype/pick_list/pick_list.js:180
 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12
 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:674
@@ -49858,8 +49991,8 @@ msgid "Stock Reservation Entries Cancelled"
 msgstr ""
 
 #: erpnext/controllers/subcontracting_inward_controller.py:1026
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2247
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2150
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2245
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2214
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1777
 msgid "Stock Reservation Entries Created"
 msgstr ""
@@ -49887,7 +50020,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:568
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
 msgid "Stock Reservation Warehouse Mismatch"
 msgstr ""
 
@@ -49927,7 +50060,7 @@ msgstr ""
 #: erpnext/selling/doctype/selling_settings/selling_settings.py:115
 #: erpnext/setup/doctype/company/company.json
 #: erpnext/setup/workspace/erpnext_settings/erpnext_settings.json
-#: erpnext/stock/doctype/item/item.js:408
+#: erpnext/stock/doctype/item/item.js:409
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:675
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 #: erpnext/stock/workspace/stock/stock.json
@@ -49955,12 +50088,6 @@ msgstr ""
 msgid "Stock Transactions"
 msgstr ""
 
-#. Label of the section_break_9 (Section Break) field in DocType 'Stock
-#. Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Stock Transactions Settings"
-msgstr ""
-
 #. Label of the stock_uom (Link) field in DocType 'POS Invoice Item'
 #. Label of the stock_uom (Link) field in DocType 'Purchase Invoice Item'
 #. Label of the stock_uom (Link) field in DocType 'Sales Invoice Item'
@@ -50053,12 +50180,6 @@ msgstr ""
 msgid "Stock UOM"
 msgstr ""
 
-#. Label of the conversion_factor_section (Section Break) field in DocType
-#. 'Stock Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Stock UOM Quantity"
-msgstr ""
-
 #: erpnext/public/js/stock_reservation.js:230
 #: erpnext/selling/doctype/sales_order/sales_order.js:459
 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:327
@@ -50074,7 +50195,7 @@ msgstr ""
 msgid "Stock Uom"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:737
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:753
 msgid "Stock Update Not Allowed"
 msgstr ""
 
@@ -50178,15 +50299,15 @@ msgstr ""
 msgid "Stock cannot be reserved in the group warehouse {0}."
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1225
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1256
 msgid "Stock cannot be updated against the following Delivery Notes: {0}"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1294
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1325
 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:734
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:750
 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 ""
 
@@ -50194,6 +50315,11 @@ msgstr ""
 msgid "Stock entries exist with the old account. Changing the account may lead to a mismatch between the warehouse closing balance and the account closing balance. The overall closing balance will still match, but not for the specific account."
 msgstr ""
 
+#. Label of the stock_frozen_upto (Date) field in DocType 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Stock frozen up to"
+msgstr ""
+
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1131
 msgid "Stock has been unreserved for work order {0}."
 msgstr ""
@@ -50210,13 +50336,13 @@ msgstr ""
 msgid "Stock transactions before {0} are frozen"
 msgstr ""
 
-#. Description of the 'Freeze Stocks Older Than (Days)' (Int) field in DocType
+#. Description of the 'Freeze stocks older than (days)' (Int) field in DocType
 #. 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "Stock transactions that are older than the mentioned days cannot be modified."
 msgstr ""
 
-#. Description of the 'Auto Reserve Stock for Sales Order on Purchase' (Check)
+#. Description of the 'Auto reserve Stock for Sales Order on Purchase' (Check)
 #. field in DocType 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "Stock will be reserved on submission of <b>Purchase Receipt</b> created against Material Request for Sales Order."
@@ -50237,7 +50363,7 @@ msgstr ""
 msgid "Stop Reason"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1106
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1170
 msgid "Stopped Work Order cannot be cancelled, Unstop it first to cancel"
 msgstr ""
 
@@ -50322,7 +50448,7 @@ msgstr ""
 msgid "Sub Procedure"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:626
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:627
 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again."
 msgstr ""
 
@@ -50532,7 +50658,7 @@ msgstr ""
 #. Receipt Supplied Item'
 #. Label of a Workspace Sidebar Item
 #: erpnext/buying/doctype/purchase_order/purchase_order.js:404
-#: erpnext/controllers/subcontracting_controller.py:1173
+#: erpnext/controllers/subcontracting_controller.py:1174
 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
 #: erpnext/stock/doctype/stock_entry/stock_entry.json
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
@@ -50570,7 +50696,7 @@ msgstr ""
 msgid "Subcontracting Order Supplied Item"
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:988
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:976
 msgid "Subcontracting Order {0} created."
 msgstr ""
 
@@ -50608,7 +50734,7 @@ msgstr ""
 #: erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json
 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json
-#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:643
+#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:638
 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 #: erpnext/subcontracting/workspace/subcontracting/subcontracting.json
 #: erpnext/workspace_sidebar/subcontracting.json
@@ -50659,8 +50785,8 @@ msgstr ""
 msgid "Subdivision"
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:984
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1116
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:972
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1113
 msgid "Submit Action Failed"
 msgstr ""
 
@@ -50677,14 +50803,14 @@ msgstr ""
 #. Label of the submit_journal_entries (Check) field in DocType 'Accounts
 #. Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Submit Journal Entries"
+msgid "Submit Journal entries"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:173
+#: erpnext/manufacturing/doctype/work_order/work_order.js:185
 msgid "Submit this Work Order for further processing."
 msgstr ""
 
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:309
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:318
 msgid "Submit your Quotation"
 msgstr ""
 
@@ -50727,11 +50853,11 @@ msgstr ""
 msgid "Subscription End Date"
 msgstr ""
 
-#: erpnext/accounts/doctype/subscription/subscription.py:363
+#: erpnext/accounts/doctype/subscription/subscription.py:372
 msgid "Subscription End Date is mandatory to follow calendar months"
 msgstr ""
 
-#: erpnext/accounts/doctype/subscription/subscription.py:353
+#: erpnext/accounts/doctype/subscription/subscription.py:362
 msgid "Subscription End Date must be after {0} as per the subscription plan"
 msgstr ""
 
@@ -50791,7 +50917,7 @@ msgstr ""
 msgid "Subscription Start Date"
 msgstr ""
 
-#: erpnext/accounts/doctype/subscription/subscription.py:735
+#: erpnext/accounts/doctype/subscription/subscription.py:746
 msgid "Subscription for Future dates cannot be processed."
 msgstr ""
 
@@ -51181,7 +51307,7 @@ msgstr ""
 msgid "Supplier Invoice No"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1781
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1803
 msgid "Supplier Invoice No exists in Purchase Invoice {0}"
 msgstr ""
 
@@ -51336,7 +51462,7 @@ msgstr ""
 msgid "Supplier Quotation Item"
 msgstr ""
 
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:503
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:512
 msgid "Supplier Quotation {0} Created"
 msgstr ""
 
@@ -51553,7 +51679,7 @@ msgstr ""
 msgid "Synchronize all accounts every hour"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:661
+#: erpnext/accounts/doctype/account/account.py:662
 msgid "System In Use"
 msgstr ""
 
@@ -51601,7 +51727,7 @@ msgstr ""
 msgid "TDS Computation Summary"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1542
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1561
 msgid "TDS Deducted"
 msgstr ""
 
@@ -51756,7 +51882,7 @@ msgstr ""
 msgid "Target Warehouse Address Link"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:250
+#: erpnext/manufacturing/doctype/work_order/work_order.py:319
 msgid "Target Warehouse Reservation Error"
 msgstr ""
 
@@ -51764,21 +51890,21 @@ msgstr ""
 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 ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:794
+#: erpnext/manufacturing/doctype/work_order/work_order.py:858
 msgid "Target Warehouse is required before Submit"
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:886
+#: erpnext/controllers/selling_controller.py:885
 msgid "Target Warehouse is set for some items but the customer is not an internal customer."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:321
+#: erpnext/manufacturing/doctype/work_order/work_order.py:390
 msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcontracting Inward Order Item."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:853
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:859
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:874
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:930
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:936
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:951
 msgid "Target warehouse is mandatory for row {0}"
 msgstr ""
 
@@ -51817,16 +51943,6 @@ msgstr ""
 msgid "Task Description"
 msgstr ""
 
-#. Label of the task_name (Data) field in DocType 'Asset Maintenance Log'
-#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
-msgid "Task Name"
-msgstr ""
-
-#. Option for the '% Complete Method' (Select) field in DocType 'Project'
-#: erpnext/projects/doctype/project/project.json
-msgid "Task Progress"
-msgstr ""
-
 #. Name of a DocType
 #: erpnext/projects/doctype/task_type/task_type.json
 msgid "Task Type"
@@ -51892,7 +52008,7 @@ msgstr ""
 msgid "Tax Amount After Discount Amount (Company Currency)"
 msgstr ""
 
-#. Description of the 'Round Tax Amount Row-wise' (Check) field in DocType
+#. Description of the 'Round tax amount row-wise' (Check) field in DocType
 #. 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 msgid "Tax Amount will be rounded on a row(items) level"
@@ -52246,7 +52362,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:239
-#: erpnext/controllers/taxes_and_totals.py:1249
+#: erpnext/controllers/taxes_and_totals.py:1262
 msgid "Taxable Amount"
 msgstr ""
 
@@ -52706,7 +52822,7 @@ msgstr ""
 #: erpnext/selling/doctype/quotation/quotation.json
 #: erpnext/selling/doctype/sales_order/sales_order.json
 #: erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py:103
-#: erpnext/selling/report/inactive_customers/inactive_customers.py:76
+#: erpnext/selling/report/inactive_customers/inactive_customers.py:79
 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:87
 #: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:42
 #: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:47
@@ -52779,7 +52895,7 @@ msgstr ""
 msgid "The 'From Package No.' field must neither be empty nor it's value less than 1."
 msgstr ""
 
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:414
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:423
 msgid "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings."
 msgstr ""
 
@@ -52828,11 +52944,11 @@ msgstr ""
 msgid "The Payment Term at row {0} is possibly a duplicate."
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:342
+#: erpnext/stock/doctype/pick_list/pick_list.py:345
 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:2832
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:2909
 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty"
 msgstr ""
 
@@ -52840,15 +52956,15 @@ msgstr ""
 msgid "The Sales Person is linked with {0}"
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:208
+#: erpnext/stock/doctype/pick_list/pick_list.py:211
 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:2669
+#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2650
 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:1849
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1926
 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 ""
 
@@ -52894,7 +53010,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:1211
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1223
 msgid "The default BOM for that item will be fetched by the system. You can also change the BOM."
 msgstr ""
 
@@ -52919,7 +53035,7 @@ msgstr ""
 msgid "The field To Shareholder cannot be blank"
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:418
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:387
 msgid "The field {0} in row {1} is not set"
 msgstr ""
 
@@ -52952,7 +53068,7 @@ msgstr ""
 msgid "The following assets have failed to automatically post depreciation entries: {0}"
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:306
+#: erpnext/stock/doctype/pick_list/pick_list.py:309
 msgid "The following batches are expired, please restock them: <br> {0}"
 msgstr ""
 
@@ -53001,7 +53117,7 @@ msgstr ""
 msgid "The holiday on {0} is not between From Date and To Date"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:1255
+#: erpnext/controllers/buying_controller.py:1242
 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master."
 msgstr ""
 
@@ -53009,7 +53125,7 @@ msgstr ""
 msgid "The items {0} and {1} are present in the following {2} :"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:1248
+#: erpnext/controllers/buying_controller.py:1235
 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters."
 msgstr ""
 
@@ -53079,7 +53195,7 @@ msgstr ""
 msgid "The percentage you are allowed to bill more against the amount ordered. For example, if the order value is $100 for an item and tolerance is set as 10%, then you are allowed to bill up to $110 "
 msgstr ""
 
-#. Description of the 'Over Picking Allowance' (Percent) field in DocType
+#. Description of the 'Over Picking Allowance (%)' (Percent) field in DocType
 #. 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "The percentage you are allowed to pick more items in the pick list than the ordered quantity."
@@ -53091,8 +53207,8 @@ msgstr ""
 msgid "The percentage you are allowed to receive or deliver more against the quantity ordered. For example, if you have ordered 100 units, and your Allowance is 10%, then you are allowed to receive 110 units."
 msgstr ""
 
-#. Description of the 'Over Transfer Allowance' (Float) field in DocType 'Stock
-#. Settings'
+#. Description of the 'Over Transfer Allowance (%)' (Float) field in DocType
+#. 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 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 ""
@@ -53106,7 +53222,7 @@ msgstr ""
 msgid "The reserved stock will be released when you update items. Are you certain you wish to proceed?"
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.js:164
+#: erpnext/stock/doctype/pick_list/pick_list.js:169
 msgid "The reserved stock will be released. Are you certain you wish to proceed?"
 msgstr ""
 
@@ -53122,7 +53238,7 @@ msgstr ""
 msgid "The selected change account {} doesn't belongs to Company {}."
 msgstr ""
 
-#: erpnext/stock/doctype/batch/batch.py:157
+#: erpnext/stock/doctype/batch/batch.py:156
 msgid "The selected item cannot have Batch"
 msgstr ""
 
@@ -53139,7 +53255,7 @@ msgstr ""
 msgid "The serial and batch bundle {0} not linked to {1} {2}"
 msgstr ""
 
-#: erpnext/stock/doctype/batch/batch.py:432
+#: erpnext/stock/doctype/batch/batch.py:429
 msgid "The serial no {0} does not belong to item {1}"
 msgstr ""
 
@@ -53211,7 +53327,7 @@ msgstr ""
 msgid "The user will be able to transfer additional materials from the store to the Work in Progress (WIP) warehouse."
 msgstr ""
 
-#. Description of the 'Role Allowed to Edit Frozen Stock' (Link) field in
+#. Description of the 'Role allowed to edit frozen stock' (Link) field in
 #. DocType 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "The users with this Role are allowed to create/modify a stock transaction, even though the transaction is frozen."
@@ -53225,15 +53341,15 @@ msgstr ""
 msgid "The value {0} is already assigned to an existing Item {1}."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1239
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1251
 msgid "The warehouse where you store finished Items before they are shipped."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1232
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1244
 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:1244
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1256
 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 ""
 
@@ -53241,7 +53357,7 @@ msgstr ""
 msgid "The {0} ({1}) must be equal to {2} ({3})"
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:3336
+#: erpnext/public/js/controllers/transaction.js:3355
 msgid "The {0} contains Unit Price Items."
 msgstr ""
 
@@ -53289,7 +53405,7 @@ msgstr ""
 msgid "There are no slots available on this date"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:1161
+#: erpnext/stock/doctype/item/item.js:1204
 msgid "There are two options to maintain valuation of stock. FIFO (first in - first out) and Moving Average. To understand this topic in detail please visit <a href='https://docs.frappe.io/erpnext/user/manual/en/calculation-of-valuation-rate-in-fifo-and-moving-average' target='_blank'>Item Valuation, FIFO and Moving Average.</a>"
 msgstr ""
 
@@ -53317,11 +53433,11 @@ msgstr ""
 msgid "There is already an active Subcontracting BOM {0} for the Finished Good {1}."
 msgstr ""
 
-#: erpnext/stock/doctype/batch/batch.py:440
+#: erpnext/stock/doctype/batch/batch.py:437
 msgid "There is no batch found against the {0}: {1}"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1786
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1863
 msgid "There must be atleast 1 Finished Good in this Stock Entry"
 msgstr ""
 
@@ -53364,11 +53480,15 @@ msgstr ""
 msgid "This Month's Summary"
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:997
+#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1745
+msgid "This Payment Entry is reconciled with {0}. Cancelling will automatically unreconcile it. Do you want to proceed?"
+msgstr ""
+
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:985
 msgid "This Purchase Order has been fully subcontracted."
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:2078
+#: erpnext/selling/doctype/sales_order/sales_order.py:2079
 msgid "This Sales Order has been fully subcontracted."
 msgstr ""
 
@@ -53394,6 +53514,12 @@ msgstr ""
 msgid "This asset category is marked as non-depreciable. Please disable depreciation calculation or choose a different category."
 msgstr ""
 
+#. Description of the 'Allow negative stock' (Check) field in DocType 'Stock
+#. Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "This can be enabled at specific Item level as well"
+msgstr ""
+
 #: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py:7
 msgid "This covers all scorecards tied to this Setup"
 msgstr ""
@@ -53485,19 +53611,19 @@ msgstr ""
 msgid "This is based on transactions against this Sales Person. See timeline below for details"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_settings/stock_settings.js:48
+#: erpnext/stock/doctype/stock_settings/stock_settings.js:107
 msgid "This is considered dangerous from accounting point of view."
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:537
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:531
 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:1225
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1237
 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 ""
 
-#: erpnext/stock/doctype/item/item.js:1149
+#: erpnext/stock/doctype/item/item.js:1192
 msgid "This is for raw material Items that'll be used to create finished goods. If the Item is an additional service like 'washing' that'll be used in the BOM, keep this unchecked."
 msgstr ""
 
@@ -53519,6 +53645,12 @@ msgstr ""
 msgid "This option can be checked to edit the 'Posting Date' and 'Posting Time' fields."
 msgstr ""
 
+#. Description of the 'Raise Material Request when stock reaches re-order
+#. level' (Check) field in DocType 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "This option is useful if you want to ensure a constant supply of raw materials/products and avoid shortage. A Material Request will be raised automatically when stock reached the re-order level defined in the Item form."
+msgstr ""
+
 #: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py:212
 msgid "This schedule was created when Asset {0} was adjusted through Asset Value Adjustment {1}."
 msgstr ""
@@ -53531,7 +53663,7 @@ msgstr ""
 msgid "This schedule was created when Asset {0} was repaired through Asset Repair {1}."
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1501
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1532
 msgid "This schedule was created when Asset {0} was restored due to Sales Invoice {1} cancellation."
 msgstr ""
 
@@ -53543,7 +53675,7 @@ msgstr ""
 msgid "This schedule was created when Asset {0} was restored."
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1497
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1528
 msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
 msgstr ""
 
@@ -53555,7 +53687,7 @@ msgstr ""
 msgid "This schedule was created when Asset {0} was {1} into new Asset {2}."
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1473
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1504
 msgid "This schedule was created when Asset {0} was {1} through Sales Invoice {2}."
 msgstr ""
 
@@ -53598,13 +53730,19 @@ msgstr ""
 msgid "This will be appended to the Item Code of the variant. For example, if your abbreviation is \"SM\", and the item code is \"T-SHIRT\", the item code of the variant will be \"T-SHIRT-SM\""
 msgstr ""
 
+#. Description of the 'Have default Naming Series for Batch ID?' (Check) field
+#. in DocType 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "This will be applied if no naming series is configured in Item master"
+msgstr ""
+
 #. Description of the 'Create User Permission' (Check) field in DocType
 #. 'Employee'
 #: erpnext/setup/doctype/employee/employee.json
 msgid "This will restrict user access to other employee records"
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:887
+#: erpnext/controllers/selling_controller.py:886
 msgid "This {} will be treated as material transfer."
 msgstr ""
 
@@ -53777,7 +53915,7 @@ msgstr ""
 msgid "Timesheet for tasks."
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:894
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:925
 msgid "Timesheet {0} cannot be invoiced in its current state"
 msgstr ""
 
@@ -53902,7 +54040,7 @@ msgstr ""
 
 #. Label of the to_fiscal_year (Link) field in DocType 'Budget'
 #: erpnext/accounts/doctype/budget/budget.json
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:51
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:59
 msgid "To Fiscal Year"
 msgstr ""
 
@@ -54047,7 +54185,7 @@ msgstr ""
 msgid "To add Operations tick the 'With Operations' checkbox."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.js:740
+#: erpnext/manufacturing/doctype/production_plan/production_plan.js:741
 msgid "To add subcontracted Item's raw materials if include exploded items is disabled."
 msgstr ""
 
@@ -54075,11 +54213,11 @@ msgstr ""
 msgid "To be Delivered to Customer"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:558
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:573
 msgid "To cancel a {} you need to cancel the POS Closing Entry {}."
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:571
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:586
 msgid "To cancel this Sales Invoice you need to cancel the POS Closing Entry {}."
 msgstr ""
 
@@ -54091,7 +54229,7 @@ msgstr ""
 msgid "To enable Capital Work in Progress Accounting,"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.js:733
+#: erpnext/manufacturing/doctype/production_plan/production_plan.js:734
 msgid "To include non-stock items in the material request planning. i.e. Items for which 'Maintain Stock' checkbox is unticked."
 msgstr ""
 
@@ -54102,7 +54240,7 @@ msgid "To include sub-assembly costs and secondary items in Finished Goods on a
 msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2247
-#: erpnext/controllers/accounts_controller.py:3253
+#: erpnext/controllers/accounts_controller.py:3248
 msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included"
 msgstr ""
 
@@ -54114,7 +54252,7 @@ msgstr ""
 msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:552
+#: erpnext/accounts/doctype/account/account.py:553
 msgid "To overrule this, enable '{0}' in company {1}"
 msgstr ""
 
@@ -54122,11 +54260,11 @@ msgstr ""
 msgid "To still proceed with editing this Attribute Value, enable {0} in Item Variant Settings."
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:628
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:622
 msgid "To submit the invoice without purchase order please set {0} as {1} in {2}"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:649
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:644
 msgid "To submit the invoice without purchase receipt please set {0} as {1} in {2}"
 msgstr ""
 
@@ -54235,7 +54373,7 @@ msgstr ""
 msgid "Total Active Items"
 msgstr ""
 
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:359
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:343
 msgid "Total Actual"
 msgstr ""
 
@@ -54368,7 +54506,7 @@ msgstr ""
 msgid "Total Billing Hours"
 msgstr ""
 
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:359
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:343
 msgid "Total Budget"
 msgstr ""
 
@@ -54628,11 +54766,11 @@ msgstr ""
 msgid "Total Operation Time"
 msgstr ""
 
-#: erpnext/selling/report/inactive_customers/inactive_customers.py:80
+#: erpnext/selling/report/inactive_customers/inactive_customers.py:83
 msgid "Total Order Considered"
 msgstr ""
 
-#: erpnext/selling/report/inactive_customers/inactive_customers.py:79
+#: erpnext/selling/report/inactive_customers/inactive_customers.py:82
 msgid "Total Order Value"
 msgstr ""
 
@@ -54670,7 +54808,7 @@ msgstr ""
 msgid "Total Paid Amount"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2801
+#: erpnext/controllers/accounts_controller.py:2803
 msgid "Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total"
 msgstr ""
 
@@ -54741,8 +54879,8 @@ msgstr ""
 #: erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py:147
 #: erpnext/selling/doctype/quotation/quotation.json
 #: erpnext/selling/doctype/sales_order/sales_order.json
-#: erpnext/selling/page/point_of_sale/pos_item_cart.js:537
-#: erpnext/selling/page/point_of_sale/pos_item_cart.js:541
+#: erpnext/selling/page/point_of_sale/pos_item_cart.js:543
+#: erpnext/selling/page/point_of_sale/pos_item_cart.js:547
 #: erpnext/stock/doctype/delivery_note/delivery_note.json
 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
@@ -54906,7 +55044,7 @@ msgstr ""
 msgid "Total Value Difference (Incoming - Outgoing)"
 msgstr ""
 
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:359
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:343
 #: erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py:144
 msgid "Total Variance"
 msgstr ""
@@ -54964,7 +55102,7 @@ msgstr ""
 msgid "Total Workstation Time (In Hours)"
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:256
+#: erpnext/controllers/selling_controller.py:257
 msgid "Total allocated percentage for sales team should be 100"
 msgstr ""
 
@@ -54985,7 +55123,7 @@ msgid "Total hours: {0}"
 msgstr ""
 
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:570
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:542
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:557
 msgid "Total payments amount can't be greater than {}"
 msgstr ""
 
@@ -55276,7 +55414,7 @@ msgstr ""
 msgid "Transactions against the Company already exist! Chart of Accounts can only be imported for a Company with no transactions."
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1158
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1189
 msgid "Transactions using Sales Invoice in POS are disabled."
 msgstr ""
 
@@ -55290,8 +55428,8 @@ msgstr ""
 #: erpnext/buying/doctype/purchase_order/purchase_order.js:398
 #: erpnext/stock/doctype/item_reorder/item_reorder.json
 #: erpnext/stock/doctype/serial_no/serial_no.json
+#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:646
 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:651
-#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:656
 msgid "Transfer"
 msgstr ""
 
@@ -55477,7 +55615,7 @@ msgstr ""
 msgid "Trial Period End Date"
 msgstr ""
 
-#: erpnext/accounts/doctype/subscription/subscription.py:339
+#: erpnext/accounts/doctype/subscription/subscription.py:342
 msgid "Trial Period End Date Cannot be before Trial Period Start Date"
 msgstr ""
 
@@ -55486,7 +55624,7 @@ msgstr ""
 msgid "Trial Period Start Date"
 msgstr ""
 
-#: erpnext/accounts/doctype/subscription/subscription.py:345
+#: erpnext/accounts/doctype/subscription/subscription.py:348
 msgid "Trial Period Start date cannot be after Subscription Start Date"
 msgstr ""
 
@@ -55496,10 +55634,10 @@ msgstr ""
 msgid "Trialing"
 msgstr ""
 
-#. Description of the 'General Ledger' (Int) field in DocType 'Accounts
-#. Settings'
-#. Description of the 'Accounts Receivable/Payable' (Int) field in DocType
+#. Description of the 'General Ledger remarks length' (Int) field in DocType
 #. 'Accounts Settings'
+#. Description of the 'Accounts Receivable / Payable remarks length' (Int)
+#. field in DocType 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 msgid "Truncates 'Remarks' column to set character length"
 msgstr ""
@@ -55610,6 +55748,7 @@ msgstr ""
 #. Label of the stock_uom (Link) field in DocType 'Production Plan Item'
 #. Label of the uom (Link) field in DocType 'Production Plan Sub Assembly Item'
 #. Label of the uom (Link) field in DocType 'Sales Forecast Item'
+#. Label of the uom (Link) field in DocType 'Work Order Additional Item'
 #. Label of the uom (Link) field in DocType 'Quality Goal Objective'
 #. Label of the uom (Link) field in DocType 'Quality Review Objective'
 #. Label of the uom (Link) field in DocType 'Delivery Schedule Item'
@@ -55661,6 +55800,7 @@ msgstr ""
 #: 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/doctype/sales_forecast_item/sales_forecast_item.json
+#: erpnext/manufacturing/doctype/work_order_additional_item/work_order_additional_item.json
 #: 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
@@ -55672,13 +55812,15 @@ msgstr ""
 #: erpnext/selling/doctype/quotation_item/quotation_item.json
 #: erpnext/selling/doctype/sales_order/sales_order.js:1696
 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json
+#: erpnext/selling/page/point_of_sale/pos_item_selector.js:117
 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:43
 #: erpnext/selling/report/sales_analytics/sales_analytics.py:138
 #: erpnext/setup/doctype/uom/uom.json erpnext/stock/doctype/bin/bin.json
 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
 #: erpnext/stock/doctype/delivery_stop/delivery_stop.json
 #: erpnext/stock/doctype/item/item.json
-#: erpnext/stock/doctype/item/item_list.js:41
+#: erpnext/stock/doctype/item/item_list.js:42
+#: erpnext/stock/doctype/item/item_prices.html:85
 #: erpnext/stock/doctype/item_barcode/item_barcode.json
 #: erpnext/stock/doctype/item_price/item_price.json
 #: erpnext/stock/doctype/material_request_item/material_request_item.json
@@ -55755,7 +55897,7 @@ msgstr ""
 msgid "UOM Conversion Factor"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1470
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1468
 msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}"
 msgstr ""
 
@@ -55763,12 +55905,18 @@ msgstr ""
 msgid "UOM Conversion factor is required in row {0}"
 msgstr ""
 
+#. Label of the conversion_factor_section (Section Break) field in DocType
+#. 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "UOM Defaults"
+msgstr ""
+
 #. Label of the uom_name (Data) field in DocType 'UOM'
 #: erpnext/setup/doctype/uom/uom.json
 msgid "UOM Name"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:4025
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:4107
 msgid "UOM conversion factor required for UOM: {0} in Item: {1}"
 msgstr ""
 
@@ -55808,7 +55956,7 @@ msgstr ""
 msgid "UTM Analytics"
 msgstr ""
 
-#. Option for the 'Data Fetch Method' (Select) field in DocType 'Accounts
+#. Option for the 'Data fetch method' (Select) field in DocType 'Accounts
 #. Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 msgid "UnBuffered Cursor"
@@ -55840,7 +55988,7 @@ msgstr ""
 msgid "Unable to find score starting at {0}. You need to have standing scores covering 0 to 100"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1064
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1128
 msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}."
 msgstr ""
 
@@ -55931,7 +56079,7 @@ msgstr ""
 msgid "Unit Of Measure"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4089
+#: erpnext/controllers/accounts_controller.py:4094
 msgid "Unit Price"
 msgstr ""
 
@@ -55959,13 +56107,13 @@ msgstr ""
 #. Label of the unlink_advance_payment_on_cancelation_of_order (Check) field in
 #. DocType 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Unlink Advance Payment on Cancellation of Order"
+msgid "Unlink Advance Payment on cancellation of order"
 msgstr ""
 
 #. Label of the unlink_payment_on_cancellation_of_invoice (Check) field in
 #. DocType 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Unlink Payment on Cancellation of Invoice"
+msgid "Unlink Payment on cancellation of invoice"
 msgstr ""
 
 #: erpnext/accounts/doctype/bank_account/bank_account.js:33
@@ -56076,9 +56224,9 @@ msgstr ""
 msgid "Unreconciled Entries"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:934
+#: erpnext/manufacturing/doctype/work_order/work_order.js:946
 #: erpnext/selling/doctype/sales_order/sales_order.js:122
-#: erpnext/stock/doctype/pick_list/pick_list.js:161
+#: erpnext/stock/doctype/pick_list/pick_list.js:166
 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:193
 msgid "Unreserve"
 msgstr ""
@@ -56099,7 +56247,7 @@ msgstr ""
 
 #: erpnext/public/js/stock_reservation.js:281
 #: erpnext/selling/doctype/sales_order/sales_order.js:522
-#: erpnext/stock/doctype/pick_list/pick_list.js:313
+#: erpnext/stock/doctype/pick_list/pick_list.js:321
 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:390
 msgid "Unreserving Stock..."
 msgstr ""
@@ -56276,12 +56424,6 @@ msgstr ""
 msgid "Update Current Stock"
 msgstr ""
 
-#. Label of the update_existing_price_list_rate (Check) field in DocType 'Stock
-#. Settings'
-#: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Update Existing Price List Rate"
-msgstr ""
-
 #: erpnext/buying/doctype/purchase_order/purchase_order.js:324
 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:43
 #: erpnext/public/js/utils.js:946
@@ -56304,7 +56446,7 @@ msgstr ""
 #. Label of the update_price_list_based_on (Select) field in DocType 'Stock
 #. Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Update Price List Based On"
+msgid "Update Price List based on"
 msgstr ""
 
 #: erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js:10
@@ -56336,6 +56478,12 @@ msgstr ""
 msgid "Update Type"
 msgstr ""
 
+#. Label of the update_existing_price_list_rate (Check) field in DocType 'Stock
+#. Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Update existing Price List Rate"
+msgstr ""
+
 #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM
 #. Update Tool'
 #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json
@@ -56380,7 +56528,7 @@ msgstr ""
 msgid "Updating Variants..."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1187
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1199
 msgid "Updating Work Order status"
 msgstr ""
 
@@ -56403,7 +56551,7 @@ msgstr ""
 msgid "Upon enabling this, the JV will be submitted for a different exchange rate."
 msgstr ""
 
-#. Description of the 'Auto Reserve Stock' (Check) field in DocType 'Stock
+#. Description of the 'Auto reserve stock' (Check) field in DocType 'Stock
 #. Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "Upon submission of the Sales Order, Work Order, or Production Plan, the system will automatically reserve the stock."
@@ -56487,18 +56635,6 @@ msgstr ""
 msgid "Use Legacy (Client side) Reactivity"
 msgstr ""
 
-#. Label of the use_legacy_budget_controller (Check) field in DocType 'Accounts
-#. Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Use Legacy Budget Controller"
-msgstr ""
-
-#. Label of the use_legacy_controller_for_pcv (Check) field in DocType
-#. 'Accounts Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Use Legacy Controller For Period Closing Voucher"
-msgstr ""
-
 #. Label of the use_multi_level_bom (Check) field in DocType 'Work Order'
 #. Label of the use_multi_level_bom (Check) field in DocType 'Stock Entry'
 #: erpnext/manufacturing/doctype/bom/bom.js:434
@@ -56516,7 +56652,7 @@ msgstr ""
 #. Label of the use_serial_batch_fields (Check) field in DocType 'Stock
 #. Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Use Serial / Batch Fields"
+msgid "Use Serial / Batch fields"
 msgstr ""
 
 #. Label of the use_serial_batch_fields (Check) field in DocType 'POS Invoice
@@ -56575,6 +56711,18 @@ msgstr ""
 msgid "Use for Shopping Cart"
 msgstr ""
 
+#. Label of the use_legacy_budget_controller (Check) field in DocType 'Accounts
+#. Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "Use legacy Budget Controller"
+msgstr ""
+
+#. Label of the use_legacy_controller_for_pcv (Check) field in DocType
+#. 'Accounts Settings'
+#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+msgid "Use legacy controller for Period Closing Voucher"
+msgstr ""
+
 #. Label of the fallback_to_default_price_list (Check) field in DocType
 #. 'Selling Settings'
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
@@ -56669,7 +56817,7 @@ msgstr ""
 msgid "Users can make manufacture entry against Job Cards"
 msgstr ""
 
-#. Description of the 'Role Allowed to Over Bill ' (Link) field in DocType
+#. Description of the 'Role Allowed to over bill ' (Link) field in DocType
 #. 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 msgid "Users with this role are allowed to over bill above the allowance percentage"
@@ -56687,7 +56835,7 @@ msgstr ""
 msgid "Users with this role will be notified if the asset depreciation gets failed"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_settings/stock_settings.js:44
+#: erpnext/stock/doctype/stock_settings/stock_settings.js:103
 msgid "Using negative stock disables FIFO/Moving average valuation when inventory is negative."
 msgstr ""
 
@@ -56784,6 +56932,10 @@ msgstr ""
 msgid "Valid Up To date not in Fiscal Year {0}"
 msgstr ""
 
+#: erpnext/stock/doctype/item/item_prices.html:86
+msgid "Valid Upto"
+msgstr ""
+
 #. Label of the countries (Table) field in DocType 'Shipping Rule'
 #: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
 msgid "Valid for Countries"
@@ -56818,7 +56970,7 @@ msgstr ""
 #. Label of the validate_material_transfer_warehouses (Check) field in DocType
 #. 'Stock Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
-msgid "Validate Material Transfer Warehouses"
+msgid "Validate Material Transfer warehouses"
 msgstr ""
 
 #. Label of the validate_negative_stock (Check) field in DocType 'Inventory
@@ -56978,7 +57130,7 @@ msgid "Valuation rate for the item as per Sales Invoice (Only for Internal Trans
 msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2271
-#: erpnext/controllers/accounts_controller.py:3277
+#: erpnext/controllers/accounts_controller.py:3272
 msgid "Valuation type charges can not be marked as Inclusive"
 msgstr ""
 
@@ -57091,10 +57243,10 @@ msgstr ""
 msgid "Variables"
 msgstr ""
 
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:247
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:251
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:333
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:343
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:231
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:235
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:317
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:327
 msgid "Variance"
 msgstr ""
 
@@ -57103,7 +57255,7 @@ msgid "Variance ({})"
 msgstr ""
 
 #: erpnext/stock/doctype/item/item.js:241
-#: erpnext/stock/doctype/item/item_list.js:59
+#: erpnext/stock/doctype/item/item_list.js:61
 #: erpnext/stock/report/item_variant_details/item_variant_details.py:74
 msgid "Variant"
 msgstr ""
@@ -57156,7 +57308,7 @@ msgstr ""
 msgid "Variant Of"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:838
+#: erpnext/stock/doctype/item/item.js:875
 msgid "Variant creation has been queued."
 msgstr ""
 
@@ -57267,6 +57419,10 @@ msgstr ""
 msgid "View Account Coverage"
 msgstr ""
 
+#: erpnext/stock/doctype/item/item_prices.html:123
+msgid "View All Prices"
+msgstr ""
+
 #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js:25
 msgid "View BOM Update Log"
 msgstr ""
@@ -57675,6 +57831,12 @@ msgstr ""
 msgid "Warehouse Contact Info"
 msgstr ""
 
+#. Label of the warehouse_defaults_section (Section Break) field in DocType
+#. 'Stock Settings'
+#: erpnext/stock/doctype/stock_settings/stock_settings.json
+msgid "Warehouse Defaults"
+msgstr ""
+
 #. Label of the warehouse_detail (Section Break) field in DocType 'Warehouse'
 #: erpnext/stock/doctype/warehouse/warehouse.json
 msgid "Warehouse Detail"
@@ -57764,8 +57926,8 @@ msgstr ""
 msgid "Warehouse not found against the account {0}"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1215
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:445
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1246
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:414
 msgid "Warehouse required for stock Item {0}"
 msgstr ""
 
@@ -57790,7 +57952,7 @@ msgstr ""
 msgid "Warehouse {0} does not exist"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:247
+#: erpnext/manufacturing/doctype/work_order/work_order.py:316
 msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}"
 msgstr ""
 
@@ -57823,8 +57985,8 @@ msgstr ""
 msgid "Warehouses with existing transaction can not be converted to ledger."
 msgstr ""
 
-#. Option for the 'Action if Same Rate is Not Maintained Throughout  Internal
-#. Transaction' (Select) field in DocType 'Accounts Settings'
+#. Option for the 'Action if same rate is not maintained throughout internal
+#. transaction' (Select) field in DocType 'Accounts Settings'
 #. Option for the 'Action if Annual Budget Exceeded on MR' (Select) field in
 #. DocType 'Budget'
 #. Option for the 'Action if Accumulated Monthly Budget Exceeded on MR'
@@ -57845,9 +58007,9 @@ msgstr ""
 #. DocType 'Buying Settings'
 #. Option for the 'Action if same rate is not maintained throughout sales
 #. cycle' (Select) field in DocType 'Selling Settings'
-#. Option for the 'Action If Quality Inspection Is Not Submitted' (Select)
+#. Option for the 'Action if Quality Inspection is not submitted' (Select)
 #. field in DocType 'Stock Settings'
-#. Option for the 'Action If Quality Inspection Is Rejected' (Select) field in
+#. Option for the 'Action if Quality Inspection is rejected' (Select) field in
 #. DocType 'Stock Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 #: erpnext/accounts/doctype/budget/budget.json
@@ -57919,7 +58081,7 @@ msgstr ""
 msgid "Warning: Account changed for warehouse"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1322
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1326
 msgid "Warning: Another {0} # {1} exists against stock entry {2}"
 msgstr ""
 
@@ -57927,7 +58089,7 @@ msgstr ""
 msgid "Warning: Material Requested Qty is less than Minimum Order Qty"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1483
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1547
 msgid "Warning: Quantity exceeds maximum producible quantity based on quantity of raw materials received through the Subcontracting Inward Order {0}."
 msgstr ""
 
@@ -58198,7 +58360,7 @@ msgstr ""
 msgid "When checked, the system will use the posting datetime of the document for naming the document instead of the creation datetime of the document."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:1168
+#: erpnext/stock/doctype/item/item.js:1211
 msgid "When creating an Item, entering a value for this field will automatically create an Item Price at the backend."
 msgstr ""
 
@@ -58208,7 +58370,7 @@ msgstr ""
 msgid "When enabled, it adds a cutoff date filter to Delivery Notes created in bulk from Sales Orders. This allows you to process orders only with a transaction date up to the specified cutoff date, which is useful for period-end processing and batch fulfillment."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:304
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:381
 msgid "When there are multiple finished goods ({0}) in a Repack stock entry, the basic rate for all finished goods must be set manually. To set rate manually, enable the checkbox 'Set Basic Rate Manually' in the respective finished good row."
 msgstr ""
 
@@ -58384,6 +58546,11 @@ msgstr ""
 msgid "Work Order / Subcontract PO"
 msgstr ""
 
+#. Name of a DocType
+#: erpnext/manufacturing/doctype/work_order_additional_item/work_order_additional_item.json
+msgid "Work Order Additional Item"
+msgstr ""
+
 #: erpnext/manufacturing/dashboard_fixtures.py:93
 msgid "Work Order Analysis"
 msgstr ""
@@ -58402,7 +58569,7 @@ msgstr ""
 msgid "Work Order Item"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:917
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:994
 msgid "Work Order Mismatch"
 msgstr ""
 
@@ -58447,12 +58614,12 @@ msgstr ""
 msgid "Work Order cannot be created for following reason: <br> {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1427
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1491
 msgid "Work Order cannot be raised against a Item Template"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2506
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2586
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2570
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2650
 msgid "Work Order has been {0}"
 msgstr ""
 
@@ -58464,11 +58631,11 @@ msgstr ""
 msgid "Work Order {0} created"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2396
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:2473
 msgid "Work Order {0} has no produced qty"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:954
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1031
 msgid "Work Order {0}: Job Card not found for the operation {1}"
 msgstr ""
 
@@ -58498,7 +58665,7 @@ msgstr ""
 msgid "Work-in-Progress Warehouse"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:792
+#: erpnext/manufacturing/doctype/work_order/work_order.py:856
 msgid "Work-in-Progress Warehouse is required before Submit"
 msgstr ""
 
@@ -58515,7 +58682,6 @@ msgstr ""
 #. Option in a Select field in the tasks Web Form
 #: erpnext/projects/doctype/task/task.json
 #: erpnext/projects/web_form/tasks/tasks.json
-#: erpnext/templates/pages/task_info.html:73
 msgid "Working"
 msgstr ""
 
@@ -58546,7 +58712,7 @@ msgstr ""
 #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
 #: erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json
 #: erpnext/manufacturing/doctype/job_card/job_card.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:325
+#: erpnext/manufacturing/doctype/work_order/work_order.js:337
 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
 #: erpnext/manufacturing/doctype/workstation/workstation.json
 #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.js:35
@@ -58805,7 +58971,7 @@ msgstr ""
 msgid "You are importing data for the code list:"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3886
+#: erpnext/controllers/accounts_controller.py:3891
 msgid "You are not allowed to update as per the conditions set in {} Workflow."
 msgstr ""
 
@@ -58821,7 +58987,7 @@ msgstr ""
 msgid "You are not authorized to set Frozen value"
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:513
+#: erpnext/stock/doctype/pick_list/pick_list.py:516
 msgid "You are picking more than required quantity for the item {0}. Check if there is any other pick list created for the sales order {1}."
 msgstr ""
 
@@ -58841,7 +59007,7 @@ msgstr ""
 msgid "You can also use variables in the series name by putting them between (.) dots"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1016
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1047
 msgid "You can change the parent account to a Balance Sheet account or select a different account."
 msgstr ""
 
@@ -58930,7 +59096,7 @@ msgstr ""
 msgid "You cannot repost item valuation before {}"
 msgstr ""
 
-#: erpnext/accounts/doctype/subscription/subscription.py:719
+#: erpnext/accounts/doctype/subscription/subscription.py:730
 msgid "You cannot restart a Subscription that is not cancelled."
 msgstr ""
 
@@ -58950,7 +59116,7 @@ msgstr ""
 msgid "You do not have permission to edit this document"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3862
+#: erpnext/controllers/accounts_controller.py:3867
 msgid "You do not have permissions to {} items in a {}."
 msgstr ""
 
@@ -58962,19 +59128,19 @@ msgstr ""
 msgid "You don't have enough points to redeem."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4434
+#: erpnext/controllers/accounts_controller.py:4439
 msgid "You don't have permission to create a Company Address. Please contact your System Manager."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4414
+#: erpnext/controllers/accounts_controller.py:4419
 msgid "You don't have permission to update Company details. Please contact your System Manager."
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:602
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:590
 msgid "You don't have permission to update Received Qty DocField for item {0}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4408
+#: erpnext/controllers/accounts_controller.py:4413
 msgid "You don't have permission to update this document. Please contact your System Manager."
 msgstr ""
 
@@ -59018,7 +59184,7 @@ msgstr ""
 msgid "You need to cancel POS Closing Entry {} to be able to cancel this document."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3228
+#: erpnext/controllers/accounts_controller.py:3223
 msgid "You selected the account group {1} as {2} Account in row {0}. Please select a single account."
 msgstr ""
 
@@ -59069,7 +59235,7 @@ msgstr ""
 msgid "Zero Rated"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:628
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:705
 msgid "Zero quantity"
 msgstr ""
 
@@ -59135,8 +59301,8 @@ msgstr ""
 msgid "cannot be greater than 100"
 msgstr ""
 
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:334
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1104
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:336
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1135
 msgid "dated {0}"
 msgstr ""
 
@@ -59233,7 +59399,7 @@ msgstr ""
 msgid "material_request_item"
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:217
+#: erpnext/controllers/selling_controller.py:218
 msgid "must be between 0 and 100"
 msgstr ""
 
@@ -59241,7 +59407,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: erpnext/templates/pages/task_info.html:90
+#: erpnext/templates/pages/task_info.html:75
 msgid "on"
 msgstr ""
 
@@ -59308,7 +59474,7 @@ msgstr ""
 msgid "received from"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1475
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1506
 msgid "returned"
 msgstr ""
 
@@ -59343,11 +59509,11 @@ msgstr ""
 msgid "sandbox"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1475
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1506
 msgid "sold"
 msgstr ""
 
-#: erpnext/accounts/doctype/subscription/subscription.py:695
+#: erpnext/accounts/doctype/subscription/subscription.py:706
 msgid "subscription is already cancelled."
 msgstr ""
 
@@ -59370,7 +59536,7 @@ msgstr ""
 msgid "to"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3174
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3221
 msgid "to unallocate the amount of this Return Invoice before cancelling it."
 msgstr ""
 
@@ -59379,7 +59545,7 @@ msgstr ""
 msgid "unique e.g. SAVE20  To be used to get discount"
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:632
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:620
 msgid "updated delivered quantity for item {0} to {1}"
 msgstr ""
 
@@ -59409,7 +59575,7 @@ msgstr ""
 msgid "{0} '{1}' not in Fiscal Year {2}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:678
+#: erpnext/manufacturing/doctype/work_order/work_order.py:742
 msgid "{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3}"
 msgstr ""
 
@@ -59454,7 +59620,7 @@ msgstr ""
 msgid "{0} Operating Cost for operation {1}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:560
+#: erpnext/manufacturing/doctype/work_order/work_order.js:572
 msgid "{0} Operations: {1}"
 msgstr ""
 
@@ -59478,7 +59644,7 @@ msgstr ""
 msgid "{0} account is not of type {1}"
 msgstr ""
 
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:519
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:510
 msgid "{0} account not found while submitting purchase receipt"
 msgstr ""
 
@@ -59531,9 +59697,9 @@ msgstr ""
 msgid "{0} cannot be zero"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:923
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1039
-#: erpnext/stock/doctype/pick_list/pick_list.py:1332
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:921
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1037
+#: erpnext/stock/doctype/pick_list/pick_list.py:1341
 #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py:322
 msgid "{0} created"
 msgstr ""
@@ -59550,7 +59716,7 @@ msgstr ""
 msgid "{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution."
 msgstr ""
 
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:140
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:141
 msgid "{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution."
 msgstr ""
 
@@ -59592,7 +59758,7 @@ msgstr ""
 msgid "{0} hours"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2741
+#: erpnext/controllers/accounts_controller.py:2743
 msgid "{0} in row {1}"
 msgstr ""
 
@@ -59622,7 +59788,7 @@ msgstr ""
 msgid "{0} is in Draft. Submit it before creating the Asset."
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1130
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1161
 msgid "{0} is mandatory for Item {1}"
 msgstr ""
 
@@ -59635,7 +59801,7 @@ msgstr ""
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3185
+#: erpnext/controllers/accounts_controller.py:3180
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}."
 msgstr ""
 
@@ -59651,11 +59817,11 @@ msgstr ""
 msgid "{0} is not a group node. Please select a group node as parent cost center"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:680
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:757
 msgid "{0} is not a stock Item"
 msgstr ""
 
-#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:419
+#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:407
 msgid "{0} is not a valid Accounting Dimension."
 msgstr ""
 
@@ -59691,27 +59857,27 @@ msgstr ""
 msgid "{0} is open. Close the POS or cancel the existing POS Opening Entry to create a new POS Opening Entry."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:525
+#: erpnext/manufacturing/doctype/work_order/work_order.js:537
 msgid "{0} items disassembled"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:489
+#: erpnext/manufacturing/doctype/work_order/work_order.js:501
 msgid "{0} items in progress"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:513
+#: erpnext/manufacturing/doctype/work_order/work_order.js:525
 msgid "{0} items lost during process."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:470
+#: erpnext/manufacturing/doctype/work_order/work_order.js:482
 msgid "{0} items produced"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:493
+#: erpnext/manufacturing/doctype/work_order/work_order.js:505
 msgid "{0} items returned"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:496
+#: erpnext/manufacturing/doctype/work_order/work_order.js:508
 msgid "{0} items to return"
 msgstr ""
 
@@ -59719,7 +59885,7 @@ msgstr ""
 msgid "{0} must be negative in return document"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2366
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2406
 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 ""
 
@@ -59743,11 +59909,11 @@ msgstr ""
 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation."
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:1087
+#: erpnext/stock/doctype/pick_list/pick_list.py:1090
 msgid "{0} units of Item {1} is not available in any of the warehouses."
 msgstr ""
 
-#: erpnext/stock/doctype/pick_list/pick_list.py:1080
+#: erpnext/stock/doctype/pick_list/pick_list.py:1083
 msgid "{0} units of Item {1} is not available in any of the warehouses. Other Pick Lists exist for this item."
 msgstr ""
 
@@ -59776,7 +59942,7 @@ msgstr ""
 msgid "{0} valid serial nos for Item {1}"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:843
+#: erpnext/stock/doctype/item/item.js:880
 msgid "{0} variants created."
 msgstr ""
 
@@ -59830,7 +59996,7 @@ msgstr ""
 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 ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:437
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:425
 #: erpnext/selling/doctype/sales_order/sales_order.py:600
 #: erpnext/stock/doctype/material_request/material_request.py:255
 msgid "{0} {1} has been modified. Please refresh."
@@ -59852,8 +60018,8 @@ msgstr ""
 msgid "{0} {1} is associated with {2}, but Party Account is {3}"
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:495
-#: erpnext/controllers/subcontracting_controller.py:1173
+#: erpnext/controllers/selling_controller.py:494
+#: erpnext/controllers/subcontracting_controller.py:1174
 msgid "{0} {1} is cancelled or closed"
 msgstr ""
 
@@ -59910,8 +60076,8 @@ msgstr ""
 msgid "{0} {1} not allowed to be reposted. You can enable it by adding it '{2}' table in {3}."
 msgstr ""
 
-#: erpnext/buying/utils.py:116
-msgid "{0} {1} status is {2}"
+#: erpnext/buying/utils.py:117
+msgid "{0} {1} status is {2}."
 msgstr ""
 
 #: erpnext/public/js/utils/serial_no_batch_selector.js:241
@@ -59973,11 +60139,11 @@ msgstr ""
 msgid "{0}%"
 msgstr ""
 
-#: erpnext/controllers/website_list_for_contact.py:203
+#: erpnext/controllers/website_list_for_contact.py:206
 msgid "{0}% Billed"
 msgstr ""
 
-#: erpnext/controllers/website_list_for_contact.py:211
+#: erpnext/controllers/website_list_for_contact.py:214
 msgid "{0}% Delivered"
 msgstr ""
 
@@ -60031,11 +60197,11 @@ msgstr ""
 msgid "{0}: {1} must be less than {2}"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:1030
+#: erpnext/controllers/buying_controller.py:1017
 msgid "{count} Assets created for {item_code}"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:928
+#: erpnext/controllers/buying_controller.py:915
 msgid "{doctype} {name} is cancelled or closed."
 msgstr ""
 
@@ -60043,19 +60209,19 @@ msgstr ""
 msgid "{field_label} is mandatory for sub-contracted {doctype}."
 msgstr ""
 
-#: erpnext/controllers/stock_controller.py:2147
+#: erpnext/controllers/stock_controller.py:2201
 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:736
-msgid "{ref_doctype} {ref_name} is {status}."
+#: erpnext/controllers/stock_controller.py:1966
+msgid "{ref_doctype} {ref_name} status is {status}."
 msgstr ""
 
 #: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:432
 msgid "{}"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2132
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2172
 msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
 msgstr ""