From de4280ece3e7931a8253f7eef6d42dd8340b9658 Mon Sep 17 00:00:00 2001
From: frappe-pr-bot <developers@erpnext.com>
Date: Sun, 26 Apr 2026 09:48:52 +0000
Subject: [PATCH] chore: update POT file

---
 erpnext/locale/main.pot | 1999 +++++++++++++++++++++------------------
 1 file changed, 1077 insertions(+), 922 deletions(-)

diff --git a/erpnext/locale/main.pot b/erpnext/locale/main.pot
index bacf12f631e..0ab380aea3e 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-04-19 09:47+0000\n"
-"PO-Revision-Date: 2026-04-19 09:47+0000\n"
+"POT-Creation-Date: 2026-04-26 09:48+0000\n"
+"PO-Revision-Date: 2026-04-26 09:48+0000\n"
 "Last-Translator: hello@frappe.io\n"
 "Language-Team: hello@frappe.io\n"
 "MIME-Version: 1.0\n"
@@ -106,7 +106,7 @@ msgstr ""
 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item"
 msgstr ""
 
-#: erpnext/public/js/utils/serial_no_batch_selector.js:262
+#: erpnext/public/js/utils/serial_no_batch_selector.js:273
 msgid "\"SN-01::10\" for \"SN-01\" to \"SN-10\""
 msgstr ""
 
@@ -267,7 +267,7 @@ msgstr ""
 msgid "% of materials delivered against this Sales Order"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2381
+#: erpnext/controllers/accounts_controller.py:2384
 msgid "'Account' in the Accounting section of Customer {0}"
 msgstr ""
 
@@ -275,7 +275,7 @@ msgstr ""
 msgid "'Allow Multiple Sales Orders Against a Customer's Purchase Order'"
 msgstr ""
 
-#: erpnext/controllers/trends.py:56
+#: erpnext/controllers/trends.py:62
 msgid "'Based On' and 'Group By' can not be same"
 msgstr ""
 
@@ -283,11 +283,11 @@ msgstr ""
 msgid "'Days Since Last Order' must be greater than or equal to zero"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2386
+#: erpnext/controllers/accounts_controller.py:2389
 msgid "'Default {0} Account' in Company {1}"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1229
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1230
 msgid "'Entries' cannot be empty"
 msgstr ""
 
@@ -602,8 +602,8 @@ msgstr ""
 msgid "90 Above"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1330
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1331
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1338
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1339
 msgid "<0"
 msgstr ""
 
@@ -768,7 +768,7 @@ msgstr ""
 msgid "<li>Clearance date must be after cheque date for row(s): {0}</li>"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2264
+#: erpnext/controllers/accounts_controller.py:2267
 msgid "<li>Item {0} in row(s) {1} billed more than {2}</li>"
 msgstr ""
 
@@ -785,7 +785,7 @@ msgstr ""
 msgid "<li>{}</li>"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2261
+#: erpnext/controllers/accounts_controller.py:2264
 msgid "<p>Cannot overbill for the following Items:</p>"
 msgstr ""
 
@@ -822,7 +822,7 @@ msgstr ""
 msgid "<p>Please correct the following row(s):</p><ul>"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:121
+#: erpnext/controllers/buying_controller.py:125
 msgid "<p>Posting Date {0} cannot be before Purchase Order date for the following:</p><ul>"
 msgstr ""
 
@@ -830,7 +830,7 @@ msgstr ""
 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 ""
 
-#: erpnext/controllers/accounts_controller.py:2273
+#: erpnext/controllers/accounts_controller.py:2276
 msgid "<p>To allow over-billing, please set allowance in Accounts Settings.</p>"
 msgstr ""
 
@@ -1004,7 +1004,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:1763
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1764
 msgid "A Reverse Journal Entry {0} already exists for this Journal Entry."
 msgstr ""
 
@@ -1138,7 +1138,7 @@ msgstr ""
 msgid "Abbreviation: {0} must appear only once"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1327
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1335
 msgid "Above"
 msgstr ""
 
@@ -1335,7 +1335,7 @@ msgid "Account Manager"
 msgstr ""
 
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1007
-#: erpnext/controllers/accounts_controller.py:2390
+#: erpnext/controllers/accounts_controller.py:2393
 msgid "Account Missing"
 msgstr ""
 
@@ -1532,11 +1532,11 @@ msgstr ""
 msgid "Account {0} is frozen"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1467
+#: erpnext/controllers/accounts_controller.py:1468
 msgid "Account {0} is invalid. Account Currency must be {1}"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:353
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:354
 msgid "Account {0} should be of type Expense"
 msgstr ""
 
@@ -1556,11 +1556,11 @@ msgstr ""
 msgid "Account {0}: You can not assign itself as parent account"
 msgstr ""
 
-#: erpnext/accounts/general_ledger.py:464
+#: erpnext/accounts/general_ledger.py:465
 msgid "Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:371
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:372
 msgid "Account: {0} can only be updated via Stock Transactions"
 msgstr ""
 
@@ -1568,7 +1568,7 @@ msgstr ""
 msgid "Account: {0} is not permitted under Payment Entry"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3279
+#: erpnext/controllers/accounts_controller.py:3282
 msgid "Account: {0} with currency: {1} can not be selected"
 msgstr ""
 
@@ -1858,7 +1858,7 @@ msgstr ""
 msgid "Accounting Entry for LCV in Stock Entry {0}"
 msgstr ""
 
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:910
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:942
 msgid "Accounting Entry for Landed Cost Voucher for SCR {0}"
 msgstr ""
 
@@ -1880,7 +1880,7 @@ msgstr ""
 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:936
 #: erpnext/stock/doctype/stock_entry/stock_entry.py:2001
 #: erpnext/stock/doctype/stock_entry/stock_entry.py:2015
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:745
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:777
 msgid "Accounting Entry for Stock"
 msgstr ""
 
@@ -1888,7 +1888,7 @@ msgstr ""
 msgid "Accounting Entry for {0}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2431
+#: erpnext/controllers/accounts_controller.py:2434
 msgid "Accounting Entry for {0}: {1} can only be made in currency: {2}"
 msgstr ""
 
@@ -1995,7 +1995,7 @@ msgstr ""
 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:256
 #: erpnext/accounts/doctype/journal_entry/journal_entry.json
 #: erpnext/accounts/report/accounts_payable/accounts_payable.json
-#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:113
+#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:124
 #: erpnext/buying/doctype/supplier/supplier.js:110
 #: erpnext/workspace_sidebar/financial_reports.json
 #: erpnext/workspace_sidebar/invoicing.json
@@ -2004,7 +2004,7 @@ msgid "Accounts Payable"
 msgstr ""
 
 #. Name of a report
-#: erpnext/accounts/report/accounts_payable/accounts_payable.js:164
+#: erpnext/accounts/report/accounts_payable/accounts_payable.js:175
 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.json
 msgid "Accounts Payable Summary"
 msgstr ""
@@ -2020,7 +2020,7 @@ msgstr ""
 #: erpnext/accounts/doctype/journal_entry/journal_entry.json
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.json
-#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:136
+#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:147
 #: erpnext/selling/doctype/customer/customer.js:162
 #: erpnext/workspace_sidebar/financial_reports.json
 #: erpnext/workspace_sidebar/invoicing.json
@@ -2047,7 +2047,7 @@ msgid "Accounts Receivable Discounted Account"
 msgstr ""
 
 #. Name of a report
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:191
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:202
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.json
 msgid "Accounts Receivable Summary"
 msgstr ""
@@ -2083,7 +2083,7 @@ msgstr ""
 msgid "Accounts Setup"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1328
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1329
 msgid "Accounts table cannot be blank."
 msgstr ""
 
@@ -2247,7 +2247,7 @@ msgstr ""
 #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling
 #. Settings'
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Action if Same Rate is Not Maintained Throughout Sales Cycle"
+msgid "Action if same rate is not maintained throughout sales cycle"
 msgstr ""
 
 #. Label of the action_on_new_invoice (Select) field in DocType 'POS Profile'
@@ -2389,7 +2389,7 @@ msgstr ""
 msgid "Actual End Date (via Timesheet)"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:225
+#: erpnext/manufacturing/doctype/work_order/work_order.py:229
 msgid "Actual End Date cannot be before Actual Start Date"
 msgstr ""
 
@@ -2892,7 +2892,7 @@ msgstr ""
 msgid "Additional Discount Amount (Company Currency)"
 msgstr ""
 
-#: erpnext/controllers/taxes_and_totals.py:836
+#: erpnext/controllers/taxes_and_totals.py:850
 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})"
 msgstr ""
 
@@ -2987,7 +2987,7 @@ msgstr ""
 msgid "Additional Information updated successfully."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:829
+#: erpnext/manufacturing/doctype/work_order/work_order.js:836
 msgid "Additional Material Transfer"
 msgstr ""
 
@@ -3010,7 +3010,7 @@ msgstr ""
 msgid "Additional Transferred Qty"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:694
+#: erpnext/manufacturing/doctype/work_order/work_order.py:710
 msgid ""
 "Additional Transferred Qty {0}\n"
 "\t\t\t\t\tcannot be greater than {1}.\n"
@@ -3024,7 +3024,7 @@ msgstr ""
 msgid "Additional information regarding the customer."
 msgstr ""
 
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:627
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:659
 msgid "Additional {0} {1} of item {2} required as per BOM to complete this transaction"
 msgstr ""
 
@@ -3255,7 +3255,7 @@ msgstr ""
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/controllers/accounts_controller.py:284
+#: erpnext/controllers/accounts_controller.py:285
 #: erpnext/setup/doctype/company/company.json
 msgid "Advance Payments"
 msgstr ""
@@ -3291,11 +3291,11 @@ msgstr ""
 msgid "Advance amount"
 msgstr ""
 
-#: erpnext/controllers/taxes_and_totals.py:973
+#: erpnext/controllers/taxes_and_totals.py:987
 msgid "Advance amount cannot be greater than {0} {1}"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:876
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:877
 msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
 msgstr ""
 
@@ -3308,6 +3308,12 @@ msgstr ""
 msgid "Advance payments allocated against orders will only be fetched"
 msgstr ""
 
+#. Label of the advanced_features_tab (Tab Break) field in DocType 'Selling
+#. Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "Advanced Features"
+msgstr ""
+
 #. Label of the advanced_filtering (Check) field in DocType 'Financial Report
 #. Row'
 #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json
@@ -3421,7 +3427,7 @@ msgstr ""
 msgid "Against Income Account"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:738
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:739
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:777
 msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
 msgstr ""
@@ -3507,7 +3513,7 @@ msgstr ""
 
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:154
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:133
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1268
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1276
 msgid "Age (Days)"
 msgstr ""
 
@@ -3518,16 +3524,16 @@ msgstr ""
 #. Label of the ageing_based_on (Select) field in DocType 'Process Statement Of
 #. Accounts'
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/accounts_payable/accounts_payable.js:55
+#: erpnext/accounts/report/accounts_payable/accounts_payable.js:66
 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:21
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:84
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:95
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:21
 msgid "Ageing Based On"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_payable/accounts_payable.js:69
+#: erpnext/accounts/report/accounts_payable/accounts_payable.js:80
 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:35
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:98
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:109
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:35
 #: erpnext/stock/report/stock_ageing/stock_ageing.js:58
 msgid "Ageing Range"
@@ -3631,7 +3637,7 @@ msgstr ""
 msgid "All Activities HTML"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:390
+#: erpnext/manufacturing/doctype/bom/bom.py:391
 msgid "All BOMs"
 msgstr ""
 
@@ -3776,7 +3782,7 @@ msgstr ""
 msgid "All items have already been received"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3335
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:3337
 msgid "All items have already been transferred for this Work Order."
 msgstr ""
 
@@ -3802,7 +3808,7 @@ msgstr ""
 msgid "All the items have been already returned."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1267
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1274
 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 ""
 
@@ -3953,12 +3959,6 @@ msgstr ""
 msgid "Allow Continuous Material Consumption"
 msgstr ""
 
-#. Label of the allow_delivery_of_overproduced_qty (Check) field in DocType
-#. 'Selling Settings'
-#: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Allow Delivery of Overproduced Qty"
-msgstr ""
-
 #. Label of the allow_editing_of_items_and_quantities_in_work_order (Check)
 #. field in DocType 'Manufacturing Settings'
 #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
@@ -3997,12 +3997,6 @@ msgstr ""
 msgid "Allow Item to Be Added Multiple Times in a Transaction"
 msgstr ""
 
-#. Label of the allow_multiple_items (Check) field in DocType 'Selling
-#. Settings'
-#: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Allow Item to be Added Multiple Times in a Transaction"
-msgstr ""
-
 #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType
 #. 'CRM Settings'
 #: erpnext/crm/doctype/crm_settings/crm_settings.json
@@ -4013,12 +4007,6 @@ msgstr ""
 msgid "Allow Multiple Material Consumption"
 msgstr ""
 
-#. Label of the allow_against_multiple_purchase_orders (Check) field in DocType
-#. 'Selling Settings'
-#: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Allow Multiple Sales Orders Against a Customer's Purchase Order"
-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'
@@ -4039,10 +4027,7 @@ msgstr ""
 
 #. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying
 #. Settings'
-#. Label of the allow_negative_rates_for_items (Check) field in DocType
-#. 'Selling Settings'
 #: erpnext/buying/doctype/buying_settings/buying_settings.json
-#: erpnext/selling/doctype/selling_settings/selling_settings.json
 msgid "Allow Negative rates for Items"
 msgstr ""
 
@@ -4101,7 +4086,7 @@ msgstr ""
 #. Label of the allow_zero_qty_in_quotation (Check) field in DocType 'Selling
 #. Settings'
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Allow Quotation with Zero Quantity"
+msgid "Allow Quotation with zero quantity"
 msgstr ""
 
 #. Label of the allow_rename_attribute_value (Check) field in DocType 'Item
@@ -4145,13 +4130,13 @@ msgstr ""
 #. Label of the allow_sales_order_creation_for_expired_quotation (Check) field
 #. in DocType 'Selling Settings'
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Allow Sales Order Creation For Expired Quotation"
+msgid "Allow Sales Order creation for expired Quotation"
 msgstr ""
 
 #. Label of the allow_zero_qty_in_sales_order (Check) field in DocType 'Selling
 #. Settings'
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Allow Sales Order with Zero Quantity"
+msgid "Allow Sales Order with zero quantity"
 msgstr ""
 
 #. Label of the allow_stale (Check) field in DocType 'Accounts Settings'
@@ -4176,12 +4161,6 @@ msgstr ""
 msgid "Allow User to Edit Discount"
 msgstr ""
 
-#. Label of the editable_price_list_rate (Check) field in DocType 'Selling
-#. Settings'
-#: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Allow User to Edit Price List Rate in Transactions"
-msgstr ""
-
 #. Label of the allow_rate_change (Check) field in DocType 'POS Profile'
 #: erpnext/accounts/doctype/pos_profile/pos_profile.json
 msgid "Allow User to Edit Rate"
@@ -4223,6 +4202,18 @@ msgstr ""
 msgid "Allow Zero Valuation Rate"
 msgstr ""
 
+#. Label of the allow_delivery_of_overproduced_qty (Check) field in DocType
+#. 'Selling Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "Allow delivery of overproduced quantity"
+msgstr ""
+
+#. Label of the editable_price_list_rate (Check) field in DocType 'Selling
+#. Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "Allow editing Price List rate in transactions"
+msgstr ""
+
 #. Label of the allow_existing_serial_no (Check) field in DocType 'Stock
 #. Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
@@ -4241,6 +4232,30 @@ msgstr ""
 msgid "Allow multi-currency invoices against single party account "
 msgstr ""
 
+#. Label of the allow_against_multiple_purchase_orders (Check) field in DocType
+#. 'Selling Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "Allow multiple Sales Orders against a customer's Purchase Order"
+msgstr ""
+
+#. Label of the allow_negative_rates_for_items (Check) field in DocType
+#. 'Selling Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "Allow negative rates for Items"
+msgstr ""
+
+#. Description of the 'Zero-Quantity Line Items' (Section Break) field in
+#. DocType 'Selling Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "Allow sales transactions with zero quantities if the rate is fixed but the quantities are not. e.g. Rate Contracts"
+msgstr ""
+
+#. Label of the allow_multiple_items (Check) field in DocType 'Selling
+#. Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "Allow same Item to be added multiple times in a transaction"
+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
@@ -4308,24 +4323,12 @@ msgstr ""
 msgid "Allows users to submit Purchase Orders with zero quantity. Useful when rates are fixed but the quantities are not. Eg. Rate Contracts."
 msgstr ""
 
-#. Description of the 'Allow Quotation with Zero Quantity' (Check) field in
-#. DocType 'Selling Settings'
-#: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Allows users to submit Quotations with zero quantity. Useful when rates are fixed but the quantities are not. Eg. Rate Contracts."
-msgstr ""
-
 #. Description of the 'Allow Request for Quotation with Zero Quantity' (Check)
 #. field in DocType 'Buying Settings'
 #: erpnext/buying/doctype/buying_settings/buying_settings.json
 msgid "Allows users to submit Request for Quotations with zero quantity. Useful when rates are fixed but the quantities are not. Eg. Rate Contracts."
 msgstr ""
 
-#. Description of the 'Allow Sales Order with Zero Quantity' (Check) field in
-#. DocType 'Selling Settings'
-#: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Allows users to submit Sales Orders with zero quantity. Useful when rates are fixed but the quantities are not. Eg. Rate Contracts."
-msgstr ""
-
 #. Description of the 'Allow Supplier Quotation with Zero Quantity' (Check)
 #. field in DocType 'Buying Settings'
 #: erpnext/buying/doctype/buying_settings/buying_settings.json
@@ -4555,8 +4558,8 @@ msgstr ""
 #: erpnext/selling/page/point_of_sale/pos_item_cart.js:52
 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:52
 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:290
-#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:53
-#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:69
+#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:164
+#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:43
 #: erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py:68
 #: erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:109
 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -4742,8 +4745,8 @@ msgstr ""
 msgid "Ampere-Second"
 msgstr ""
 
-#: erpnext/controllers/trends.py:277 erpnext/controllers/trends.py:289
-#: erpnext/controllers/trends.py:298
+#: erpnext/controllers/trends.py:283 erpnext/controllers/trends.py:295
+#: erpnext/controllers/trends.py:304
 msgid "Amt"
 msgstr ""
 
@@ -5276,6 +5279,7 @@ msgid "Assembly Items"
 msgstr ""
 
 #. Option for the 'Root Type' (Select) field in DocType 'Account'
+#. Option for the 'Root Type' (Select) field in DocType 'Account Category'
 #. Option for the 'Reference Type' (Select) field in DocType 'Journal Entry
 #. Account'
 #. Option for the 'Root Type' (Select) field in DocType 'Ledger Merge'
@@ -5293,6 +5297,7 @@ msgstr ""
 #. Label of the asset (Link) field in DocType 'Serial No'
 #. Label of a Workspace Sidebar Item
 #: erpnext/accounts/doctype/account/account.json
+#: erpnext/accounts/doctype/account_category/account_category.json
 #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
 #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json
 #: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
@@ -5797,7 +5802,7 @@ msgstr ""
 msgid "Asset {0} must be submitted"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:1034
+#: erpnext/controllers/buying_controller.py:1041
 msgid "Asset {assets_link} created for {item_code}"
 msgstr ""
 
@@ -5822,7 +5827,7 @@ msgstr ""
 #. Title of a Workspace Sidebar
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 #: erpnext/accounts/doctype/finance_book/finance_book_dashboard.py:9
-#: erpnext/accounts/report/balance_sheet/balance_sheet.py:250
+#: erpnext/accounts/report/balance_sheet/balance_sheet.py:251
 #: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
 #: erpnext/assets/doctype/asset_movement/asset_movement.json
 #: erpnext/assets/workspace/assets/assets.json erpnext/desktop_icon/assets.json
@@ -5835,11 +5840,11 @@ msgstr ""
 msgid "Assets Setup"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:1052
+#: erpnext/controllers/buying_controller.py:1059
 msgid "Assets not created for {item_code}. You will have to create asset manually."
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:1039
+#: erpnext/controllers/buying_controller.py:1046
 msgid "Assets {assets_link} created for {item_code}"
 msgstr ""
 
@@ -5961,7 +5966,7 @@ msgstr ""
 msgid "Atmosphere"
 msgstr ""
 
-#: erpnext/public/js/utils/serial_no_batch_selector.js:244
+#: erpnext/public/js/utils/serial_no_batch_selector.js:255
 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:73
 msgid "Attach CSV File"
 msgstr ""
@@ -6125,7 +6130,7 @@ msgstr ""
 msgid "Auto Creation of Contact"
 msgstr ""
 
-#: erpnext/public/js/utils/serial_no_batch_selector.js:368
+#: erpnext/public/js/utils/serial_no_batch_selector.js:379
 msgid "Auto Fetch"
 msgstr ""
 
@@ -6529,6 +6534,7 @@ msgstr ""
 #. field in DocType 'Buying Settings'
 #. Label of the bom (Link) field in DocType 'Purchase Order Item'
 #. Name of a DocType
+#. Option for the 'Based On' (Select) field in DocType 'BOM'
 #. Option for the 'Backflush Raw Materials Based On' (Select) field in DocType
 #. 'Manufacturing Settings'
 #. Label of the bom_section (Section Break) field in DocType 'Manufacturing
@@ -6553,7 +6559,7 @@ msgstr ""
 #: erpnext/manufacturing/report/bom_stock_analysis/bom_stock_analysis.js:8
 #: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:109
 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1440
+#: erpnext/selling/doctype/sales_order/sales_order.js:1438
 #: erpnext/stock/doctype/material_request/material_request.js:351
 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
 #: erpnext/stock/doctype/stock_entry/stock_entry.js:788
@@ -6570,7 +6576,7 @@ msgstr ""
 msgid "BOM 1"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1801
+#: erpnext/manufacturing/doctype/bom/bom.py:1802
 msgid "BOM 1 {0} and BOM 2 {1} should not be same"
 msgstr ""
 
@@ -6586,6 +6592,11 @@ msgstr ""
 msgid "BOM Comparison Tool"
 msgstr ""
 
+#. Label of the bom_conf_tab (Tab Break) field in DocType 'BOM'
+#: erpnext/manufacturing/doctype/bom/bom.json
+msgid "BOM Configuration"
+msgstr ""
+
 #. Label of the bom_created (Check) field in DocType 'BOM Creator Item'
 #: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
 msgid "BOM Created"
@@ -6824,23 +6835,23 @@ msgstr ""
 msgid "BOM recursion: {0} cannot be child of {1}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:789
+#: erpnext/manufacturing/doctype/bom/bom.py:790
 msgid "BOM recursion: {1} cannot be parent or child of {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1540
+#: erpnext/manufacturing/doctype/bom/bom.py:1541
 msgid "BOM {0} does not belong to Item {1}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1522
+#: erpnext/manufacturing/doctype/bom/bom.py:1523
 msgid "BOM {0} must be active"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1525
+#: erpnext/manufacturing/doctype/bom/bom.py:1526
 msgid "BOM {0} must be submitted"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:877
+#: erpnext/manufacturing/doctype/bom/bom.py:878
 msgid "BOM {0} not found for the item {1}"
 msgstr ""
 
@@ -6873,7 +6884,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:381
+#: erpnext/manufacturing/doctype/work_order/work_order.js:386
 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
 msgid "Backflush Materials From WIP Warehouse"
 msgstr ""
@@ -7443,10 +7454,10 @@ msgstr ""
 #. Label of the based_on_payment_terms (Check) field in DocType 'Process
 #. Statement Of Accounts'
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/accounts_payable/accounts_payable.js:120
-#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:97
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:142
-#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:115
+#: erpnext/accounts/report/accounts_payable/accounts_payable.js:131
+#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:108
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:153
+#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:126
 msgid "Based On Payment Terms"
 msgstr ""
 
@@ -7570,7 +7581,7 @@ msgstr ""
 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:115
 #: erpnext/public/js/controllers/transaction.js:2950
 #: erpnext/public/js/utils/barcode_scanner.js:281
-#: erpnext/public/js/utils/serial_no_batch_selector.js:438
+#: erpnext/public/js/utils/serial_no_batch_selector.js:449
 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
 #: erpnext/stock/doctype/item_price/item_price.json
 #: erpnext/stock/doctype/packed_item/packed_item.json
@@ -7621,7 +7632,7 @@ msgid "Batch No."
 msgstr ""
 
 #: erpnext/public/js/utils/serial_no_batch_selector.js:16
-#: erpnext/public/js/utils/serial_no_batch_selector.js:190
+#: erpnext/public/js/utils/serial_no_batch_selector.js:201
 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:50
 msgid "Batch Nos"
 msgstr ""
@@ -7663,7 +7674,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:363
+#: erpnext/manufacturing/doctype/work_order/work_order.js:368
 #: erpnext/manufacturing/doctype/work_order/work_order.json
 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
 msgid "Batch Size"
@@ -7680,7 +7691,7 @@ msgstr ""
 msgid "Batch and Serial No"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:921
+#: erpnext/manufacturing/doctype/work_order/work_order.py:937
 msgid "Batch not created for item {} since it does not have a batch series."
 msgstr ""
 
@@ -7692,12 +7703,12 @@ msgstr ""
 msgid "Batch {0} is not available in warehouse {1}"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3519
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:3521
 #: 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:3525
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:3527
 msgid "Batch {0} of Item {1} is disabled."
 msgstr ""
 
@@ -7740,7 +7751,7 @@ msgstr ""
 #. Label of the bill_date (Date) field in DocType 'Journal Entry'
 #. Label of the bill_date (Date) field in DocType 'Subcontracting Receipt'
 #: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1253
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1261
 #: erpnext/accounts/report/purchase_register/purchase_register.py:214
 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 msgid "Bill Date"
@@ -7749,7 +7760,7 @@ msgstr ""
 #. Label of the bill_no (Data) field in DocType 'Journal Entry'
 #. Label of the bill_no (Data) field in DocType 'Subcontracting Receipt'
 #: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1252
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1260
 #: erpnext/accounts/report/purchase_register/purchase_register.py:213
 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 msgid "Bill No"
@@ -7764,7 +7775,7 @@ msgstr ""
 #. Label of a Card Break in the Manufacturing Workspace
 #. Label of a Link in the Manufacturing Workspace
 #. Label of a Workspace Sidebar Item
-#: erpnext/manufacturing/doctype/bom/bom.py:1372
+#: erpnext/manufacturing/doctype/bom/bom.py:1373
 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
 #: erpnext/stock/doctype/material_request/material_request.js:139
 #: erpnext/stock/doctype/stock_entry/stock_entry.js:774
@@ -7868,7 +7879,7 @@ msgstr ""
 msgid "Billing Address Name"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:570
+#: erpnext/controllers/accounts_controller.py:571
 msgid "Billing Address does not belong to the {0}"
 msgstr ""
 
@@ -8095,6 +8106,12 @@ msgstr ""
 msgid "Blanket Order Rate"
 msgstr ""
 
+#. Label of the blanket_orders_section (Section Break) field in DocType
+#. 'Selling Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "Blanket Orders"
+msgstr ""
+
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:260
 msgid "Block Invoice"
@@ -8203,7 +8220,7 @@ msgstr ""
 msgid "Booked Fixed Asset"
 msgstr ""
 
-#: erpnext/accounts/general_ledger.py:828
+#: erpnext/accounts/general_ledger.py:829
 msgid "Books have been closed till the period ending on {0}"
 msgstr ""
 
@@ -8694,9 +8711,9 @@ msgstr ""
 msgid "Cable Length (US)"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_payable/accounts_payable.js:62
+#: erpnext/accounts/report/accounts_payable/accounts_payable.js:73
 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:28
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:91
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:102
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:28
 msgid "Calculate Ageing With"
 msgstr ""
@@ -8720,7 +8737,7 @@ msgstr ""
 #. Label of the editable_bundle_item_rates (Check) field in DocType 'Selling
 #. Settings'
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Calculate Product Bundle Price based on Child Items' Rates"
+msgid "Calculate Product Bundle price based on child Item's rates"
 msgstr ""
 
 #. Description of the 'Hidden Line (Internal Use Only)' (Check) field in
@@ -8921,7 +8938,7 @@ msgstr ""
 msgid "Can be approved by {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2559
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2575
 msgid "Can not close Work Order. Since {0} Job Cards are in Work In Progress state."
 msgstr ""
 
@@ -8949,13 +8966,13 @@ msgstr ""
 msgid "Can not filter based on Voucher No, if grouped by Voucher"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1387
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1388
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2874
 msgid "Can only make payment against unbilled {0}"
 msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517
-#: erpnext/controllers/accounts_controller.py:3188
+#: erpnext/controllers/accounts_controller.py:3191
 #: 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 ""
@@ -9036,7 +9053,7 @@ msgstr ""
 msgid "Cannot amend {0} {1}, please create a new one instead."
 msgstr ""
 
-#: erpnext/accounts/doctype/tax_withholding_entry/tax_withholding_entry.py:1297
+#: erpnext/accounts/doctype/tax_withholding_entry/tax_withholding_entry.py:1298
 msgid "Cannot apply TDS against multiple parties in one entry"
 msgstr ""
 
@@ -9060,7 +9077,7 @@ msgstr ""
 msgid "Cannot cancel as processing of cancelled documents is pending."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1099
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1115
 msgid "Cannot cancel because submitted Stock Entry {0} exists"
 msgstr ""
 
@@ -9072,11 +9089,11 @@ msgstr ""
 msgid "Cannot cancel this Manufacturing Stock Entry as quantity of Finished Good produced cannot be less than quantity delivered in the linked Subcontracting Inward Order."
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:578
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:579
 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:1141
+#: erpnext/controllers/buying_controller.py:1148
 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue."
 msgstr ""
 
@@ -9133,7 +9150,7 @@ msgstr ""
 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 ""
 
-#: erpnext/accounts/general_ledger.py:149
+#: erpnext/accounts/general_ledger.py:150
 msgid "Cannot create accounting entries against disabled accounts: {0}"
 msgstr ""
 
@@ -9141,7 +9158,7 @@ msgstr ""
 msgid "Cannot create return for consolidated invoice {0}."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1210
+#: erpnext/manufacturing/doctype/bom/bom.py:1211
 msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
 msgstr ""
 
@@ -9162,7 +9179,7 @@ msgstr ""
 msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3784
+#: erpnext/controllers/accounts_controller.py:3790
 msgid "Cannot delete an item which has been ordered"
 msgstr ""
 
@@ -9187,7 +9204,7 @@ msgstr ""
 msgid "Cannot disable {0} as it may lead to incorrect stock valuation."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:711
+#: erpnext/manufacturing/doctype/work_order/work_order.py:727
 msgid "Cannot disassemble more than produced quantity."
 msgstr ""
 
@@ -9216,7 +9233,7 @@ msgstr ""
 msgid "Cannot find Item with this Barcode"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3736
+#: erpnext/controllers/accounts_controller.py:3742
 msgid "Cannot find a default warehouse for item {0}. Please set one in the Item Master or in Stock Settings."
 msgstr ""
 
@@ -9224,15 +9241,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:561
+#: erpnext/manufacturing/doctype/work_order/work_order.py:577
 msgid "Cannot produce more Item {0} than Sales Order quantity {1} {2}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1456
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1472
 msgid "Cannot produce more item for {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1460
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1476
 msgid "Cannot produce more than {0} items for {1}"
 msgstr ""
 
@@ -9240,12 +9257,12 @@ msgstr ""
 msgid "Cannot receive from customer against negative outstanding"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3932
+#: erpnext/controllers/accounts_controller.py:3938
 msgid "Cannot reduce quantity than ordered or purchased quantity"
 msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530
-#: erpnext/controllers/accounts_controller.py:3203
+#: erpnext/controllers/accounts_controller.py:3206
 #: 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 ""
@@ -9265,9 +9282,9 @@ msgstr ""
 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523
 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827
-#: erpnext/controllers/accounts_controller.py:3193
+#: erpnext/controllers/accounts_controller.py:3196
 #: erpnext/public/js/controllers/accounts.js:112
-#: erpnext/public/js/controllers/taxes_and_totals.js:531
+#: erpnext/public/js/controllers/taxes_and_totals.js:550
 msgid "Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"
 msgstr ""
 
@@ -9283,11 +9300,11 @@ msgstr ""
 msgid "Cannot set multiple Item Defaults for a company."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3898
+#: erpnext/controllers/accounts_controller.py:3904
 msgid "Cannot set quantity less than delivered quantity"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3899
+#: erpnext/controllers/accounts_controller.py:3905
 msgid "Cannot set quantity less than received quantity"
 msgstr ""
 
@@ -9299,7 +9316,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:3926
+#: erpnext/controllers/accounts_controller.py:3932
 msgid "Cannot update rate as item {0} is already ordered or purchased against this quotation"
 msgstr ""
 
@@ -9332,7 +9349,7 @@ msgstr ""
 msgid "Capacity Planning"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1085
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1101
 msgid "Capacity Planning Error, planned start time can not be same as end time"
 msgstr ""
 
@@ -9463,15 +9480,15 @@ msgstr ""
 msgid "Cash Flow Statement"
 msgstr ""
 
-#: erpnext/accounts/report/cash_flow/cash_flow.py:178
+#: erpnext/accounts/report/cash_flow/cash_flow.py:179
 msgid "Cash Flow from Financing"
 msgstr ""
 
-#: erpnext/accounts/report/cash_flow/cash_flow.py:171
+#: erpnext/accounts/report/cash_flow/cash_flow.py:172
 msgid "Cash Flow from Investing"
 msgstr ""
 
-#: erpnext/accounts/report/cash_flow/cash_flow.py:159
+#: erpnext/accounts/report/cash_flow/cash_flow.py:160
 msgid "Cash Flow from Operations"
 msgstr ""
 
@@ -9712,7 +9729,7 @@ msgid "Channel Partner"
 msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2256
-#: erpnext/controllers/accounts_controller.py:3256
+#: erpnext/controllers/accounts_controller.py:3259
 msgid "Charge of type 'Actual' in row {0} cannot be included in Item Rate or Paid Amount"
 msgstr ""
 
@@ -9761,7 +9778,7 @@ msgstr ""
 #. 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:69
+#: erpnext/accounts/doctype/account/account.js:87
 #: erpnext/accounts/doctype/account/account_tree.js:5
 #: erpnext/accounts/doctype/cost_center/cost_center_tree.js:52
 #: erpnext/accounts/workspace/invoicing/invoicing.json
@@ -9823,6 +9840,13 @@ msgstr ""
 msgid "Check if material transfer entry is not required"
 msgstr ""
 
+#. Description of the 'Not Applicable' (Check) field in DocType 'Item Tax
+#. Template Detail'
+#: erpnext/accounts/doctype/item_tax_template_detail/item_tax_template_detail.json
+#, python-format
+msgid "Check if this tax is not applicable to items (distinct from 0% rate)"
+msgstr ""
+
 #: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.py:58
 msgid "Check row {0} for account {1}: Party Type is only allowed for Receivable or Payable accounts"
 msgstr ""
@@ -10009,10 +10033,6 @@ msgstr ""
 msgid "Clear Last Scanned Warehouse"
 msgstr ""
 
-#: erpnext/selling/page/point_of_sale/pos_item_selector.js:264
-msgid "Clear Link"
-msgstr ""
-
 #. Label of the clear_notifications_status (Select) field in DocType
 #. 'Transaction Deletion Record'
 #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json
@@ -10124,7 +10144,7 @@ msgstr ""
 msgid "Closed Documents"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2482
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2498
 msgid "Closed Work Order can not be stopped or Re-opened"
 msgstr ""
 
@@ -10303,7 +10323,7 @@ msgstr ""
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 #: erpnext/selling/doctype/sales_order/sales_order.json
-#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:83
+#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:49
 #: erpnext/stock/doctype/delivery_note/delivery_note.json
 msgid "Commission"
 msgstr ""
@@ -10321,8 +10341,8 @@ msgstr ""
 msgid "Commission Rate"
 msgstr ""
 
-#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:67
-#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:78
+#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:168
+#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:47
 #: erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py:83
 msgid "Commission Rate %"
 msgstr ""
@@ -10747,7 +10767,7 @@ msgstr ""
 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:343
 #: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:8
 #: erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:8
-#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:33
+#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:8
 #: erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.js:33
 #: erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:8
 #: erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:33
@@ -10901,11 +10921,11 @@ msgstr ""
 msgid "Company Address Name"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4364
+#: erpnext/controllers/accounts_controller.py:4370
 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:4352
+#: erpnext/controllers/accounts_controller.py:4358
 msgid "Company Address is missing. You don't have permission to update it. Please contact your System Manager."
 msgstr ""
 
@@ -11160,7 +11180,7 @@ msgstr ""
 msgid "Completed Qty"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1374
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1390
 msgid "Completed Qty cannot be greater than 'Qty to Manufacture'"
 msgstr ""
 
@@ -11227,6 +11247,11 @@ msgstr ""
 msgid "Component Name"
 msgstr ""
 
+#. Label of the items (Table) field in DocType 'BOM'
+#: erpnext/manufacturing/doctype/bom/bom.json
+msgid "Components"
+msgstr ""
+
 #. Option for the 'Asset Type' (Select) field in DocType 'Asset'
 #: erpnext/assets/doctype/asset/asset.json
 msgid "Composite Asset"
@@ -11311,7 +11336,7 @@ msgstr ""
 msgid "Consider Minimum Order Qty"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1089
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1096
 msgid "Consider Process Loss"
 msgstr ""
 
@@ -11442,6 +11467,12 @@ msgstr ""
 msgid "Consumables"
 msgstr ""
 
+#. Label of the consume_components_section (Section Break) field in DocType
+#. 'BOM'
+#: erpnext/manufacturing/doctype/bom/bom.json
+msgid "Consume Components"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'Serial No'
 #: erpnext/stock/doctype/serial_no/serial_no.json
 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:60
@@ -11502,7 +11533,7 @@ msgstr ""
 msgid "Consumed Qty"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1750
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1766
 msgid "Consumed Qty cannot be greater than Reserved Qty for item {0}"
 msgstr ""
 
@@ -11531,7 +11562,7 @@ msgstr ""
 msgid "Consumed Stock Total Value"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry_type/stock_entry_type.py:132
+#: erpnext/stock/doctype/stock_entry_type/stock_entry_type.py:136
 msgid "Consumed quantity of item {0} exceeds transferred quantity."
 msgstr ""
 
@@ -11659,7 +11690,7 @@ msgstr ""
 msgid "Contact Person"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:582
+#: erpnext/controllers/accounts_controller.py:583
 msgid "Contact Person does not belong to the {0}"
 msgstr ""
 
@@ -11777,6 +11808,11 @@ msgstr ""
 msgid "Control Historical Stock Transactions"
 msgstr ""
 
+#. Description of the 'Based On' (Select) field in DocType 'BOM'
+#: erpnext/manufacturing/doctype/bom/bom.json
+msgid "Controls how raw materials are consumed during the ‘Manufacture’ stock entry."
+msgstr ""
+
 #. Label of the conversion_factor (Float) field in DocType 'Loyalty Program'
 #. Label of the conversion_factor (Float) field in DocType 'Purchase Order Item
 #. Supplied'
@@ -11848,15 +11884,15 @@ 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:2971
+#: erpnext/controllers/accounts_controller.py:2974
 msgid "Conversion rate cannot be 0"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2978
+#: erpnext/controllers/accounts_controller.py:2981
 msgid "Conversion rate is 1.00, but document currency is different from company currency"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2974
+#: erpnext/controllers/accounts_controller.py:2977
 msgid "Conversion rate must be 1.00 if document currency is same as company currency"
 msgstr ""
 
@@ -11866,7 +11902,7 @@ msgstr ""
 msgid "Convert Item Description to Clean HTML in Transactions"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.js:106
+#: erpnext/accounts/doctype/account/account.js:124
 #: erpnext/accounts/doctype/cost_center/cost_center.js:123
 msgid "Convert to Group"
 msgstr ""
@@ -11885,7 +11921,7 @@ msgctxt "Warehouse"
 msgid "Convert to Ledger"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.js:78
+#: erpnext/accounts/doctype/account/account.js:96
 #: erpnext/accounts/doctype/cost_center/cost_center.js:121
 msgid "Convert to Non-Group"
 msgstr ""
@@ -11956,7 +11992,6 @@ msgstr ""
 msgid "Cost"
 msgstr ""
 
-#. Label of the cost_allocation_section (Section Break) field in DocType 'BOM'
 #. Label of the cost_allocation (Currency) field in DocType 'BOM'
 #: erpnext/manufacturing/doctype/bom/bom.json
 msgid "Cost Allocation"
@@ -11968,6 +12003,12 @@ msgstr ""
 msgid "Cost Allocation %"
 msgstr ""
 
+#. Label of the cost_allocation__process_loss_section (Section Break) field in
+#. DocType 'BOM'
+#: erpnext/manufacturing/doctype/bom/bom.json
+msgid "Cost Allocation / Process Loss"
+msgstr ""
+
 #. Label of the cost_center (Link) field in DocType 'Account Closing Balance'
 #. Label of the cost_center (Link) field in DocType 'Advance Taxes and Charges'
 #. Option for the 'Budget Against' (Select) field in DocType 'Budget'
@@ -12084,7 +12125,7 @@ msgstr ""
 #: erpnext/accounts/report/accounts_payable/accounts_payable.js:28
 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:47
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:30
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1239
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1246
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:47
 #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:42
 #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
@@ -12115,7 +12156,7 @@ msgstr ""
 #: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
 #: erpnext/buying/report/procurement_tracker/procurement_tracker.js:15
 #: erpnext/buying/report/procurement_tracker/procurement_tracker.py:32
-#: erpnext/public/js/financial_statements.js:461
+#: erpnext/public/js/financial_statements.js:462
 #: erpnext/selling/doctype/sales_order/sales_order.json
 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json
 #: erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -12227,7 +12268,7 @@ msgstr ""
 msgid "Cost Per Unit"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:441
+#: erpnext/manufacturing/doctype/bom/bom.py:442
 msgid "Cost allocation between finished goods and secondary items should equal 100%"
 msgstr ""
 
@@ -12614,7 +12655,7 @@ msgstr ""
 msgid "Create Payment Request"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:811
+#: erpnext/manufacturing/doctype/work_order/work_order.js:818
 msgid "Create Pick List"
 msgstr ""
 
@@ -12641,7 +12682,7 @@ msgstr ""
 #. Title of an Onboarding Step
 #. Label of an action in the Onboarding Step 'Create Purchase Order'
 #: erpnext/buying/onboarding_step/create_purchase_order/create_purchase_order.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1693
+#: erpnext/selling/doctype/sales_order/sales_order.js:1691
 #: erpnext/utilities/activation.py:106
 msgid "Create Purchase Order"
 msgstr ""
@@ -12874,7 +12915,7 @@ msgstr ""
 msgid "Creating Accounts..."
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1568
+#: erpnext/selling/doctype/sales_order/sales_order.js:1566
 msgid "Creating Delivery Note ..."
 msgstr ""
 
@@ -12898,7 +12939,7 @@ msgstr ""
 msgid "Creating Purchase Invoices ..."
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1717
+#: erpnext/selling/doctype/sales_order/sales_order.js:1715
 msgid "Creating Purchase Order ..."
 msgstr ""
 
@@ -12917,7 +12958,7 @@ msgstr ""
 msgid "Creating Stock Entry"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1838
+#: erpnext/selling/doctype/sales_order/sales_order.js:1836
 msgid "Creating Subcontracting Inward Order ..."
 msgstr ""
 
@@ -13116,7 +13157,7 @@ msgstr ""
 #: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:176
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:147
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1262
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1270
 #: erpnext/controllers/sales_and_purchase_return.py:453
 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:303
 #: erpnext/stock/doctype/delivery_note/delivery_note.js:89
@@ -13152,7 +13193,7 @@ msgstr ""
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:375
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:383
-#: erpnext/controllers/accounts_controller.py:2370
+#: erpnext/controllers/accounts_controller.py:2373
 msgid "Credit To"
 msgstr ""
 
@@ -13348,13 +13389,13 @@ msgstr ""
 msgid "Currency can not be changed after making entries using some other currency"
 msgstr ""
 
-#: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:232
+#: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:236
 msgid "Currency filters are currently unsupported in Custom Financial Report."
 msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1604
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1672
-#: erpnext/accounts/utils.py:2532
+#: erpnext/accounts/utils.py:2533
 msgid "Currency for {0} must be {1}"
 msgstr ""
 
@@ -13362,7 +13403,7 @@ msgstr ""
 msgid "Currency of the Closing Account must be {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:723
+#: erpnext/manufacturing/doctype/bom/bom.py:724
 msgid "Currency of the price list {0} must be {1} or {2}"
 msgstr ""
 
@@ -13531,6 +13572,11 @@ msgstr ""
 msgid "Custom Financial Statement"
 msgstr ""
 
+#. Label of the custom_remark (Check) field in DocType 'Journal Entry'
+#: erpnext/accounts/doctype/journal_entry/journal_entry.json
+msgid "Custom Remark"
+msgstr ""
+
 #. Label of the custom_remarks (Check) field in DocType 'Payment Entry'
 #: erpnext/accounts/doctype/payment_entry/payment_entry.json
 msgid "Custom Remarks"
@@ -13659,7 +13705,7 @@ msgstr ""
 #: erpnext/selling/doctype/customer/customer.json
 #: erpnext/selling/doctype/installation_note/installation_note.json
 #: erpnext/selling/doctype/party_specific_item/party_specific_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1199
+#: erpnext/selling/doctype/sales_order/sales_order.js:1197
 #: erpnext/selling/doctype/sales_order/sales_order.json
 #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19
 #: erpnext/selling/doctype/sms_center/sms_center.json
@@ -13675,9 +13721,9 @@ msgstr ""
 #: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:41
 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:230
 #: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:41
-#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:32
+#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:156
 #: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:53
-#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:32
+#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:25
 #: erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.js:40
 #: erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py:54
 #: erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:53
@@ -13795,7 +13841,7 @@ msgstr ""
 #. Label of the customer_contact_display (Small Text) field in DocType
 #. 'Purchase Order'
 #. Label of the customer_contact (Small Text) field in DocType 'Delivery Stop'
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1233
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1240
 #: erpnext/buying/doctype/purchase_order/purchase_order.json
 #: erpnext/stock/doctype/delivery_stop/delivery_stop.json
 msgid "Customer Contact"
@@ -13828,8 +13874,8 @@ msgstr ""
 msgid "Customer Currency"
 msgstr ""
 
-#. Label of the customer_defaults_section (Section Break) field in DocType
-#. 'Selling Settings'
+#. Label of the customer_defaults_tab (Tab Break) field in DocType 'Selling
+#. Settings'
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
 msgid "Customer Defaults"
 msgstr ""
@@ -13899,9 +13945,9 @@ msgstr ""
 #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 #: erpnext/accounts/doctype/tax_rule/tax_rule.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:104
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1290
-#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:85
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:115
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1298
+#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:96
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:185
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:56
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:163
@@ -13960,7 +14006,7 @@ msgstr ""
 msgid "Customer Items"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1281
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1289
 msgid "Customer LPO"
 msgstr ""
 
@@ -14013,7 +14059,7 @@ msgstr ""
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
 #: erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1223
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1230
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:156
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:92
 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:35
@@ -14405,7 +14451,7 @@ msgstr ""
 msgid "Date of Joining"
 msgstr ""
 
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:200
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:272
 msgid "Date of Transaction"
 msgstr ""
 
@@ -14594,7 +14640,7 @@ msgstr ""
 #: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:178
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:147
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1265
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1273
 #: erpnext/controllers/sales_and_purchase_return.py:457
 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:304
 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:45
@@ -14624,7 +14670,7 @@ msgstr ""
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1011
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1022
-#: erpnext/controllers/accounts_controller.py:2370
+#: erpnext/controllers/accounts_controller.py:2373
 msgid "Debit To"
 msgstr ""
 
@@ -14632,7 +14678,7 @@ msgstr ""
 msgid "Debit To is required"
 msgstr ""
 
-#: erpnext/accounts/general_ledger.py:535
+#: erpnext/accounts/general_ledger.py:536
 msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
 msgstr ""
 
@@ -14798,15 +14844,15 @@ msgstr ""
 msgid "Default BOM ({0}) must be active for this item or its template"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2250
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2266
 msgid "Default BOM for {0} not found"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3970
+#: erpnext/controllers/accounts_controller.py:3976
 msgid "Default BOM not found for FG Item {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2247
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2263
 msgid "Default BOM not found for Item {0} and Project {1}"
 msgstr ""
 
@@ -15422,7 +15468,7 @@ msgstr ""
 #. Label of the deliver_secondary_items (Check) field in DocType 'Selling
 #. Settings'
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Deliver Secondary Items"
+msgid "Deliver secondary Items"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'Purchase Order'
@@ -15534,7 +15580,7 @@ msgstr ""
 #: erpnext/public/js/utils.js:895
 #: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json
 #: erpnext/selling/doctype/sales_order/sales_order.js:632
-#: erpnext/selling/doctype/sales_order/sales_order.js:1515
+#: erpnext/selling/doctype/sales_order/sales_order.js:1513
 #: erpnext/selling/doctype/sales_order/sales_order.json
 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json
 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:321
@@ -15581,7 +15627,7 @@ msgstr ""
 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:21
 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:291
 #: erpnext/accounts/report/sales_register/sales_register.py:245
-#: erpnext/selling/doctype/sales_order/sales_order.js:1050
+#: erpnext/selling/doctype/sales_order/sales_order.js:1048
 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81
 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json
 #: erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -15638,7 +15684,7 @@ msgstr ""
 msgid "Delivery Note {0} is not submitted"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1285
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1293
 #: erpnext/stock/doctype/delivery_trip/delivery_trip.js:75
 msgid "Delivery Notes"
 msgstr ""
@@ -15839,7 +15885,7 @@ msgstr ""
 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:105
 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:176
 #: erpnext/accounts/report/account_balance/account_balance.js:44
-#: erpnext/accounts/report/cash_flow/cash_flow.py:161
+#: erpnext/accounts/report/cash_flow/cash_flow.py:162
 #: erpnext/assets/doctype/asset/asset.json
 msgid "Depreciation"
 msgstr ""
@@ -16270,7 +16316,7 @@ msgstr ""
 msgid "Disable template to prevent use in reports"
 msgstr ""
 
-#: erpnext/accounts/general_ledger.py:150
+#: erpnext/accounts/general_ledger.py:151
 msgid "Disabled Account Selected"
 msgstr ""
 
@@ -16278,11 +16324,11 @@ msgstr ""
 msgid "Disabled Warehouse {0} cannot be used for this transaction."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:900
+#: erpnext/controllers/accounts_controller.py:901
 msgid "Disabled pricing rules since this {} is an internal transfer"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:914
+#: erpnext/controllers/accounts_controller.py:915
 msgid "Disabled tax included prices since this {} is an internal transfer"
 msgstr ""
 
@@ -16298,7 +16344,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:1067
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1074
 #: 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
@@ -16314,7 +16360,7 @@ msgstr ""
 msgid "Disassemble Qty cannot be less than or equal to 0."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:458
+#: erpnext/manufacturing/doctype/work_order/work_order.js:463
 msgid "Disassemble Qty cannot be less than or equal to <b>0</b>."
 msgstr ""
 
@@ -16875,6 +16921,11 @@ msgstr ""
 msgid "Do you want to submit the stock entry?"
 msgstr ""
 
+#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:50
+#: erpnext/selling/report/sales_partner_commission_summary/test_sales_partner_commission_summary.py:22
+msgid "DocType can be one of them {0}"
+msgstr ""
+
 #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:182
 #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:445
 msgid "DocType {0} does not exist"
@@ -16961,7 +17012,7 @@ msgstr ""
 #. Label of the dont_reserve_sales_order_qty_on_sales_return (Check) field in
 #. DocType 'Selling Settings'
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Don't Reserve Sales Order Qty on Sales Return"
+msgid "Don't reserve Sales Order qty on sales return"
 msgstr ""
 
 #. Label of the doors (Int) field in DocType 'Vehicle'
@@ -16980,7 +17031,7 @@ msgstr ""
 msgid "Double Declining Balance"
 msgstr ""
 
-#: erpnext/public/js/utils/serial_no_batch_selector.js:235
+#: erpnext/public/js/utils/serial_no_batch_selector.js:246
 msgid "Download CSV Template"
 msgstr ""
 
@@ -17336,8 +17387,8 @@ msgstr ""
 
 #. Option for the 'Update frequency of Project' (Select) field in DocType
 #. 'Buying Settings'
-#. Option for the 'Sales Update Frequency in Company and Project' (Select)
-#. field in DocType 'Selling Settings'
+#. Option for the 'How often should sales data be updated in Company/Project?'
+#. (Select) field in DocType 'Selling Settings'
 #: erpnext/buying/doctype/buying_settings/buying_settings.json
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
 msgid "Each Transaction"
@@ -17830,12 +17881,6 @@ msgstr ""
 msgid "Enable Common Party Accounting"
 msgstr ""
 
-#. Label of the enable_cutoff_date_on_bulk_delivery_note_creation (Check) field
-#. in DocType 'Selling Settings'
-#: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Enable Cut-Off Date on Bulk Delivery Note Creation"
-msgstr ""
-
 #. Label of the enable_deferred_expense (Check) field in DocType 'Purchase
 #. Invoice Item'
 #. Label of the enable_deferred_expense (Check) field in DocType 'Item'
@@ -17855,12 +17900,6 @@ msgstr ""
 msgid "Enable Deferred Revenue"
 msgstr ""
 
-#. Label of the enable_discount_accounting (Check) field in DocType 'Selling
-#. Settings'
-#: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Enable Discount Accounting for Selling"
-msgstr ""
-
 #. Label of the enable_discounts_and_margin (Check) field in DocType 'Accounts
 #. Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -17970,6 +18009,18 @@ msgstr ""
 msgid "Enable cost center, projects and other custom accounting dimensions"
 msgstr ""
 
+#. Label of the enable_cutoff_date_on_bulk_delivery_note_creation (Check) field
+#. in DocType 'Selling Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "Enable cut-off date on creating bulk Delivery Notes"
+msgstr ""
+
+#. Label of the enable_discount_accounting (Check) field in DocType 'Selling
+#. Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "Enable discount accounting for selling"
+msgstr ""
+
 #. Description of the 'Consider Rejected Warehouses' (Check) field in DocType
 #. 'Pick List'
 #: erpnext/stock/doctype/pick_list/pick_list.json
@@ -17987,6 +18038,18 @@ msgstr ""
 msgid "Enable this option to calculate daily depreciation by considering the total number of days in the entire depreciation period, (including leap years) while using daily pro-rata based depreciation"
 msgstr ""
 
+#. Description of the 'Allow negative rates for Items' (Check) field in DocType
+#. 'Selling Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "Enable this option to permit the use of negative rates for items in sales transactions. This setting is useful for applying substantial discounts, processing refunds or returns, and handling special promotional pricing."
+msgstr ""
+
+#. Description of the 'Validate selling price for Item against purchase or
+#. valuation rate' (Check) field in DocType 'Selling Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "Enable this to block transactions where the selling price is less than the purchase or valuation rate"
+msgstr ""
+
 #: erpnext/support/doctype/service_level_agreement/service_level_agreement.js:34
 msgid "Enable to apply SLA on every {0}"
 msgstr ""
@@ -18036,6 +18099,18 @@ msgstr ""
 msgid "Enabling this will change the way how cancelled transactions are handled."
 msgstr ""
 
+#. Description of the 'Calculate Product Bundle price based on child Item's
+#. rates' (Check) field in DocType 'Selling Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid ""
+"Enabling this will do the following:\n"
+"<ul style=\"padding-left:16px\">\n"
+"<li>Make the rate column of all Packed/Bundle Items tables editable.</li>\n"
+"<li>Calculate the prices of all <a href=\"/desk/product-bundle\" rel=\"noopener noreferrer\">Product Bundles</a> in the Items table, based on the prices of its child Items, specified in the Packed/Bundle Items table. </li>\n"
+"</ul>\n"
+"Note: If this is enabled, updating the rate of the Product Bundle in the Items table will not change its price. It will get reset to the price based on its Child Items on saving the doc."
+msgstr ""
+
 #. Label of the encashment_date (Date) field in DocType 'Employee'
 #: erpnext/setup/doctype/employee/employee.json
 msgid "Encashment Date"
@@ -18127,11 +18202,11 @@ msgstr ""
 msgid "Enter First and Last name of Employee, based on Which Full Name will be updated. IN transactions, it will be Full Name which will be fetched."
 msgstr ""
 
-#: erpnext/public/js/utils/serial_no_batch_selector.js:201
+#: erpnext/public/js/utils/serial_no_batch_selector.js:212
 msgid "Enter Manually"
 msgstr ""
 
-#: erpnext/public/js/utils/serial_no_batch_selector.js:279
+#: erpnext/public/js/utils/serial_no_batch_selector.js:290
 msgid "Enter Serial Nos"
 msgstr ""
 
@@ -18185,7 +18260,7 @@ msgstr ""
 msgid "Enter discount percentage."
 msgstr ""
 
-#: erpnext/public/js/utils/serial_no_batch_selector.js:282
+#: erpnext/public/js/utils/serial_no_batch_selector.js:293
 msgid "Enter each serial no in a new line"
 msgstr ""
 
@@ -18216,7 +18291,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:1229
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1236
 msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
 msgstr ""
 
@@ -18246,14 +18321,16 @@ msgstr ""
 
 #. Option for the 'Root Type' (Select) field in DocType 'Account'
 #. Option for the 'Account Type' (Select) field in DocType 'Account'
+#. Option for the 'Root Type' (Select) field in DocType 'Account Category'
 #. Option for the 'Root Type' (Select) field in DocType 'Ledger Merge'
 #: erpnext/accounts/doctype/account/account.json
 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:189
 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:332
+#: erpnext/accounts/doctype/account_category/account_category.json
 #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json
 #: erpnext/accounts/report/account_balance/account_balance.js:29
 #: erpnext/accounts/report/account_balance/account_balance.js:45
-#: erpnext/accounts/report/balance_sheet/balance_sheet.py:254
+#: erpnext/accounts/report/balance_sheet/balance_sheet.py:255
 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:306
 msgid "Equity"
 msgstr ""
@@ -18436,8 +18513,8 @@ msgstr ""
 msgid "Exchange Gain/Loss"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1772
-#: erpnext/controllers/accounts_controller.py:1856
+#: erpnext/controllers/accounts_controller.py:1774
+#: erpnext/controllers/accounts_controller.py:1859
 msgid "Exchange Gain/Loss amount has been booked through {0}"
 msgstr ""
 
@@ -18722,18 +18799,20 @@ msgid "Expected Value After Useful Life"
 msgstr ""
 
 #. Option for the 'Root Type' (Select) field in DocType 'Account'
+#. Option for the 'Root Type' (Select) field in DocType 'Account Category'
 #. Label of the expense (Float) field in DocType 'Cashier Closing'
 #. Option for the 'Root Type' (Select) field in DocType 'Ledger Merge'
 #. Option for the 'Type' (Select) field in DocType 'Process Deferred
 #. Accounting'
 #: erpnext/accounts/doctype/account/account.json
+#: erpnext/accounts/doctype/account_category/account_category.json
 #: 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:601
 #: 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:183
+#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:184
 #: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:199
 msgid "Expense"
 msgstr ""
@@ -19078,7 +19157,7 @@ msgstr ""
 msgid "Fees"
 msgstr ""
 
-#: erpnext/public/js/utils/serial_no_batch_selector.js:384
+#: erpnext/public/js/utils/serial_no_batch_selector.js:395
 msgid "Fetch Based On"
 msgstr ""
 
@@ -19141,10 +19220,6 @@ msgstr ""
 msgid "Fetched only {0} available serial numbers."
 msgstr ""
 
-#: erpnext/edi/doctype/code_list/code_list_import.py:28
-msgid "Fetching Error"
-msgstr ""
-
 #: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:198
 msgid "Fetching Material Requests..."
 msgstr ""
@@ -19354,11 +19429,11 @@ msgstr ""
 msgid "Financial Report Template"
 msgstr ""
 
-#: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:248
+#: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:252
 msgid "Financial Report Template {0} is disabled"
 msgstr ""
 
-#: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:245
+#: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:249
 msgid "Financial Report Template {0} not found"
 msgstr ""
 
@@ -19394,9 +19469,9 @@ msgstr ""
 msgid "Financial reports will be generated using GL Entry doctypes (should be enabled if Period Closing Voucher is not posted for all years sequentially or missing) "
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:895
-#: erpnext/manufacturing/doctype/work_order/work_order.js:910
-#: erpnext/manufacturing/doctype/work_order/work_order.js:919
+#: erpnext/manufacturing/doctype/work_order/work_order.js:902
+#: erpnext/manufacturing/doctype/work_order/work_order.js:917
+#: erpnext/manufacturing/doctype/work_order/work_order.js:926
 msgid "Finish"
 msgstr ""
 
@@ -19412,7 +19487,7 @@ msgstr ""
 #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
 #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:43
 #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:147
-#: erpnext/selling/doctype/sales_order/sales_order.js:832
+#: erpnext/selling/doctype/sales_order/sales_order.js:830
 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json
 #: erpnext/subcontracting/doctype/subcontracting_bom/subcontracting_bom.json
 msgid "Finished Good"
@@ -19453,15 +19528,15 @@ msgstr ""
 msgid "Finished Good Item Quantity"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3956
+#: erpnext/controllers/accounts_controller.py:3962
 msgid "Finished Good Item is not specified for service item {0}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3973
+#: erpnext/controllers/accounts_controller.py:3979
 msgid "Finished Good Item {0} Qty can not be zero"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3967
+#: erpnext/controllers/accounts_controller.py:3973
 msgid "Finished Good Item {0} must be a sub-contracted item"
 msgstr ""
 
@@ -19506,7 +19581,7 @@ msgstr ""
 msgid "Finished Good {0} must be a sub-contracted item."
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1419
+#: erpnext/selling/doctype/sales_order/sales_order.js:1417
 #: erpnext/setup/doctype/company/company.py:386
 msgid "Finished Goods"
 msgstr ""
@@ -19656,7 +19731,7 @@ msgstr ""
 msgid "Fiscal Year End Date should be one year after Fiscal Year Start Date"
 msgstr ""
 
-#: erpnext/controllers/trends.py:53
+#: erpnext/controllers/trends.py:59
 msgid "Fiscal Year {0} Does Not Exist"
 msgstr ""
 
@@ -19718,7 +19793,7 @@ msgstr ""
 msgid "Fixed Asset Turnover Ratio"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:780
+#: erpnext/manufacturing/doctype/bom/bom.py:781
 msgid "Fixed Asset item {0} cannot be used in BOMs."
 msgstr ""
 
@@ -19894,7 +19969,7 @@ msgstr ""
 msgid "For Raw Materials"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1438
+#: erpnext/controllers/accounts_controller.py:1439
 msgid "For Return Invoices with Stock effect, '0' qty Items are not allowed. Following rows are affected: {0}"
 msgstr ""
 
@@ -19912,13 +19987,13 @@ msgstr ""
 #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:471
 #: erpnext/manufacturing/doctype/production_plan/production_plan.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1432
+#: erpnext/selling/doctype/sales_order/sales_order.js:1430
 #: erpnext/stock/doctype/material_request/material_request.js:361
 #: erpnext/templates/form_grid/material_request_grid.html:36
 msgid "For Warehouse"
 msgstr ""
 
-#: erpnext/public/js/utils/serial_no_batch_selector.js:125
+#: erpnext/public/js/utils/serial_no_batch_selector.js:136
 msgid "For Work Order"
 msgstr ""
 
@@ -19960,11 +20035,11 @@ msgstr ""
 msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:367
+#: erpnext/manufacturing/doctype/bom/bom.py:368
 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2629
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2645
 msgid "For operation {0}: Quantity ({1}) can not be greater than pending quantity({2})"
 msgstr ""
 
@@ -20210,11 +20285,11 @@ msgstr ""
 msgid "From Date and To Date are mandatory"
 msgstr ""
 
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:25
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:29
 msgid "From Date and To Date are required"
 msgstr ""
 
-#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:29
+#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:30
 msgid "From Date and To Date lie in different Fiscal Year"
 msgstr ""
 
@@ -20225,6 +20300,10 @@ msgstr ""
 msgid "From Date cannot be greater than To Date"
 msgstr ""
 
+#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:60
+msgid "From Date cannot be greater than To Date."
+msgstr ""
+
 #: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:27
 msgid "From Date is mandatory"
 msgstr ""
@@ -20232,8 +20311,8 @@ msgstr ""
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:53
 #: erpnext/accounts/report/general_ledger/general_ledger.py:86
 #: erpnext/accounts/report/pos_register/pos_register.py:115
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:28
-#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:24
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:32
+#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:25
 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:34
 #: erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.py:38
 msgid "From Date must be before To Date"
@@ -20456,7 +20535,7 @@ msgstr ""
 msgid "From date cannot be greater than To date"
 msgstr ""
 
-#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:74
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:79
 msgid "From value must be less than to value in row {0}"
 msgstr ""
 
@@ -20590,14 +20669,14 @@ msgstr ""
 
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:188
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:155
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1277
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1285
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:177
 msgid "Future Payment Amount"
 msgstr ""
 
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:187
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:154
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1276
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1284
 msgid "Future Payment Ref"
 msgstr ""
 
@@ -20732,7 +20811,7 @@ msgstr ""
 #. 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:92
+#: 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
@@ -20922,7 +21001,7 @@ msgstr ""
 #: erpnext/public/js/controllers/buying.js:327
 #: erpnext/selling/doctype/quotation/quotation.js:183
 #: erpnext/selling/doctype/sales_order/sales_order.js:211
-#: erpnext/selling/doctype/sales_order/sales_order.js:1216
+#: erpnext/selling/doctype/sales_order/sales_order.js:1214
 #: erpnext/stock/doctype/delivery_note/delivery_note.js:187
 #: erpnext/stock/doctype/delivery_note/delivery_note.js:239
 #: erpnext/stock/doctype/material_request/material_request.js:141
@@ -21284,13 +21363,13 @@ msgstr ""
 #. Quotation'
 #. Label of the base_grand_total (Currency) field in DocType 'Quotation'
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:169
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:246
 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
 #: erpnext/selling/doctype/quotation/quotation.json
 msgid "Grand Total (Company Currency)"
 msgstr ""
 
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:175
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:252
 msgid "Grand Total (Transaction Currency)"
 msgstr ""
 
@@ -21400,11 +21479,11 @@ msgstr ""
 msgid "Gross and Net Profit Report"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:137
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:148
 msgid "Group By Customer"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_payable/accounts_payable.js:115
+#: erpnext/accounts/report/accounts_payable/accounts_payable.js:126
 msgid "Group By Supplier"
 msgstr ""
 
@@ -21446,8 +21525,8 @@ msgstr ""
 msgid "Group by Sales Order"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_payable/accounts_payable.js:145
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:177
+#: erpnext/accounts/report/accounts_payable/accounts_payable.js:156
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:188
 msgid "Group by Voucher"
 msgstr ""
 
@@ -21491,25 +21570,46 @@ msgid "H - F"
 msgstr ""
 
 #. Name of a role
+#: erpnext/accounts/doctype/account/account.json
+#: erpnext/accounts/doctype/cost_center/cost_center.json
+#: erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
 #: erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.json
 #: erpnext/crm/doctype/contract/contract.json
 #: erpnext/crm/doctype/contract_template/contract_template.json
+#: erpnext/projects/doctype/activity_type/activity_type.json
+#: erpnext/projects/doctype/project/project.json
+#: erpnext/projects/doctype/task/task.json
+#: erpnext/projects/doctype/task_type/task_type.json
+#: erpnext/projects/doctype/timesheet/timesheet.json
 #: erpnext/setup/doctype/branch/branch.json
+#: erpnext/setup/doctype/company/company.json
 #: erpnext/setup/doctype/department/department.json
-#: erpnext/setup/doctype/driver/driver.json
+#: erpnext/setup/doctype/designation/designation.json
 #: erpnext/setup/doctype/employee/employee.json
+#: erpnext/setup/doctype/employee_group/employee_group.json
 #: erpnext/setup/doctype/holiday_list/holiday_list.json
+#: erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
 #: erpnext/setup/setup_wizard/data/designation.txt:18
+#: erpnext/support/doctype/issue/issue.json
 msgid "HR Manager"
 msgstr ""
 
 #. Name of a role
+#: erpnext/accounts/doctype/account/account.json
+#: erpnext/accounts/doctype/cost_center/cost_center.json
+#: erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
+#: erpnext/projects/doctype/project/project.json
+#: erpnext/projects/doctype/task/task.json
 #: erpnext/projects/doctype/timesheet/timesheet.json
 #: erpnext/setup/doctype/branch/branch.json
+#: erpnext/setup/doctype/company/company.json
 #: erpnext/setup/doctype/department/department.json
 #: erpnext/setup/doctype/designation/designation.json
-#: erpnext/setup/doctype/driver/driver.json
 #: erpnext/setup/doctype/employee/employee.json
+#: erpnext/setup/doctype/employee_group/employee_group.json
+#: erpnext/setup/doctype/holiday_list/holiday_list.json
+#: erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
+#: erpnext/support/doctype/issue/issue.json
 msgid "HR User"
 msgstr ""
 
@@ -21532,7 +21632,7 @@ msgstr ""
 msgid "Hand"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_payable/accounts_payable.js:150
+#: erpnext/accounts/report/accounts_payable/accounts_payable.js:161
 msgid "Handle Employee Advances"
 msgstr ""
 
@@ -21778,7 +21878,7 @@ msgstr ""
 
 #. Label of the hide_tax_id (Check) field in DocType 'Selling Settings'
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Hide Customer's Tax ID from Sales Transactions"
+msgid "Hide Customer's Tax ID from sales transactions"
 msgstr ""
 
 #. Label of the hide_when_empty (Check) field in DocType 'Financial Report Row'
@@ -21822,7 +21922,7 @@ msgid "History In Company"
 msgstr ""
 
 #: erpnext/buying/doctype/purchase_order/purchase_order.js:338
-#: erpnext/selling/doctype/sales_order/sales_order.js:997
+#: erpnext/selling/doctype/sales_order/sales_order.js:995
 msgid "Hold"
 msgstr ""
 
@@ -21920,10 +22020,9 @@ msgstr ""
 msgid "How frequently?"
 msgstr ""
 
-#. Description of the 'Sales Update Frequency in Company and Project' (Select)
-#. field in DocType 'Selling Settings'
-#: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "How often should Project and Company be updated based on Sales Transactions?"
+#. Description of the 'Quantity (Output Qty)' (Float) field in DocType 'BOM'
+#: erpnext/manufacturing/doctype/bom/bom.json
+msgid "How many units of the final product this BOM makes."
 msgstr ""
 
 #. Description of the 'Update frequency of Project' (Select) field in DocType
@@ -21932,6 +22031,12 @@ msgstr ""
 msgid "How often should Project be updated of Total Purchase Cost ?"
 msgstr ""
 
+#. Label of the sales_update_frequency (Select) field in DocType 'Selling
+#. Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "How often should sales data be updated in Company/Project?"
+msgstr ""
+
 #. Description of the 'Data Source' (Select) field in DocType 'Financial Report
 #. Row'
 #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json
@@ -22148,7 +22253,7 @@ msgstr ""
 msgid "If enabled, a print of this document will be attached to each email"
 msgstr ""
 
-#. Description of the 'Enable Discount Accounting for Selling' (Check) field in
+#. Description of the 'Enable discount accounting for selling' (Check) field in
 #. DocType 'Selling Settings'
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
 msgid "If enabled, additional ledger entries will be made for discounts in a separate Discount Account"
@@ -22190,19 +22295,19 @@ msgstr ""
 msgid "If enabled, ledger entries will be posted for change amount in POS transactions"
 msgstr ""
 
-#. Description of the 'Allow Delivery of Overproduced Qty' (Check) field in
-#. DocType 'Selling Settings'
+#. Description of the 'Allow delivery of overproduced quantity' (Check) field
+#. in DocType 'Selling Settings'
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
 msgid "If enabled, system will allow user to deliver the entire quantity of the finished goods produced against the Subcontracting Inward Order. If disabled, system will allow delivery of only the ordered quantity."
 msgstr ""
 
-#. Description of the 'Set Incoming Rate as Zero for Expired Batch' (Check)
+#. Description of the 'Set incoming rate as zero for expired Batch' (Check)
 #. field in DocType 'Selling Settings'
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
 msgid "If enabled, system will set incoming rate as zero for stand-alone credit notes with expired batch item."
 msgstr ""
 
-#. Description of the 'Deliver Secondary Items' (Check) field in DocType
+#. Description of the 'Deliver secondary Items' (Check) field in DocType
 #. 'Selling Settings'
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
 msgid "If enabled, the Secondary Items generated against a Finished Good will also be added in the Stock Entry when delivering that Finished Good."
@@ -22306,6 +22411,12 @@ msgstr ""
 msgid "If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict."
 msgstr ""
 
+#. Description of the 'Use prices from Default Price List as fallback' (Check)
+#. field in DocType 'Selling Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+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'
 #. (Check) field in DocType 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -22340,7 +22451,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:1262
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1269
 msgid "If the BOM results in Scrap material, the Scrap Warehouse needs to be selected."
 msgstr ""
 
@@ -22359,7 +22470,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:1281
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1288
 msgid "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed."
 msgstr ""
 
@@ -22369,7 +22480,7 @@ msgstr ""
 msgid "If there is no assigned timeslot, then communication will be handled by this group"
 msgstr ""
 
-#: erpnext/edi/doctype/code_list/code_list_import.js:23
+#: erpnext/edi/doctype/code_list/code_list_import.js:24
 msgid "If there is no title column, use the code column for the title."
 msgstr ""
 
@@ -22526,7 +22637,7 @@ msgstr ""
 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1414
+#: erpnext/selling/doctype/sales_order/sales_order.js:1412
 msgid "Ignore Existing Ordered Qty"
 msgstr ""
 
@@ -22679,12 +22790,12 @@ msgstr ""
 msgid "Import Supplier Invoice"
 msgstr ""
 
-#: erpnext/public/js/utils/serial_no_batch_selector.js:217
+#: erpnext/public/js/utils/serial_no_batch_selector.js:228
 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:84
 msgid "Import Using CSV file"
 msgstr ""
 
-#: erpnext/edi/doctype/code_list/code_list_import.js:130
+#: erpnext/edi/doctype/code_list/code_list_import.js:131
 msgid "Import completed. {0} common codes created."
 msgstr ""
 
@@ -22696,7 +22807,11 @@ msgstr ""
 msgid "Imported {0} DocTypes"
 msgstr ""
 
-#: erpnext/edi/doctype/common_code/common_code.py:109
+#: erpnext/edi/doctype/code_list/code_list_import.py:36
+msgid "Importing Code Lists from remote URLs is not allowed."
+msgstr ""
+
+#: erpnext/edi/doctype/common_code/common_code.py:111
 msgid "Importing Common Codes"
 msgstr ""
 
@@ -22719,8 +22834,8 @@ msgstr ""
 msgid "In Mins"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_payable/accounts_payable.js:135
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:167
+#: erpnext/accounts/report/accounts_payable/accounts_payable.js:146
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:178
 msgid "In Party Currency"
 msgstr ""
 
@@ -22981,7 +23096,7 @@ msgstr ""
 #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
 #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1410
+#: erpnext/selling/doctype/sales_order/sales_order.js:1408
 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json
 #: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
@@ -23098,18 +23213,20 @@ msgid "Including items for sub assemblies"
 msgstr ""
 
 #. Option for the 'Root Type' (Select) field in DocType 'Account'
+#. Option for the 'Root Type' (Select) field in DocType 'Account Category'
 #. Option for the 'Root Type' (Select) field in DocType 'Ledger Merge'
 #. Option for the 'Type' (Select) field in DocType 'Process Deferred
 #. Accounting'
 #: erpnext/accounts/doctype/account/account.json
 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:140
 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:236
+#: 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:439
 #: 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:181
+#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:182
 #: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:192
 msgid "Income"
 msgstr ""
@@ -23252,7 +23369,7 @@ msgstr ""
 msgid "Incorrect Warehouse"
 msgstr ""
 
-#: erpnext/accounts/general_ledger.py:63
+#: erpnext/accounts/general_ledger.py:64
 msgid "Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction."
 msgstr ""
 
@@ -23498,11 +23615,11 @@ msgstr ""
 msgid "Insufficient Capacity"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3850
-#: erpnext/controllers/accounts_controller.py:3874
-#: erpnext/controllers/accounts_controller.py:4394
+#: erpnext/controllers/accounts_controller.py:3856
+#: erpnext/controllers/accounts_controller.py:3880
 #: erpnext/controllers/accounts_controller.py:4400
-#: erpnext/controllers/accounts_controller.py:4422
+#: erpnext/controllers/accounts_controller.py:4406
+#: erpnext/controllers/accounts_controller.py:4428
 msgid "Insufficient Permissions"
 msgstr ""
 
@@ -23609,7 +23726,7 @@ msgstr ""
 msgid "Inter Company Order Reference"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1153
+#: erpnext/selling/doctype/sales_order/sales_order.js:1151
 msgid "Inter Company Purchase Order"
 msgstr ""
 
@@ -23675,11 +23792,11 @@ msgstr ""
 msgid "Internal Customer for company {0} already exists"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1152
+#: erpnext/selling/doctype/sales_order/sales_order.js:1150
 msgid "Internal Purchase Order"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:800
+#: erpnext/controllers/accounts_controller.py:801
 msgid "Internal Sale or Delivery Reference missing."
 msgstr ""
 
@@ -23687,7 +23804,7 @@ msgstr ""
 msgid "Internal Sales Order"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:802
+#: erpnext/controllers/accounts_controller.py:803
 msgid "Internal Sales Reference Missing"
 msgstr ""
 
@@ -23718,7 +23835,7 @@ msgstr ""
 msgid "Internal Transfer"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:811
+#: erpnext/controllers/accounts_controller.py:812
 msgid "Internal Transfer Reference Missing"
 msgstr ""
 
@@ -23751,8 +23868,8 @@ msgstr ""
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1027
 #: erpnext/assets/doctype/asset_category/asset_category.py:69
 #: erpnext/assets/doctype/asset_category/asset_category.py:97
-#: erpnext/controllers/accounts_controller.py:3217
-#: erpnext/controllers/accounts_controller.py:3225
+#: erpnext/controllers/accounts_controller.py:3220
+#: erpnext/controllers/accounts_controller.py:3228
 msgid "Invalid Account"
 msgstr ""
 
@@ -23773,7 +23890,7 @@ msgstr ""
 msgid "Invalid Attribute"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:622
+#: erpnext/controllers/accounts_controller.py:623
 msgid "Invalid Auto Repeat Date"
 msgstr ""
 
@@ -23803,7 +23920,7 @@ msgstr ""
 
 #: erpnext/assets/doctype/asset/asset.py:361
 #: erpnext/assets/doctype/asset/asset.py:368
-#: erpnext/controllers/accounts_controller.py:3240
+#: erpnext/controllers/accounts_controller.py:3243
 msgid "Invalid Cost Center"
 msgstr ""
 
@@ -23819,7 +23936,7 @@ msgstr ""
 msgid "Invalid Discount"
 msgstr ""
 
-#: erpnext/controllers/taxes_and_totals.py:843
+#: erpnext/controllers/taxes_and_totals.py:857
 msgid "Invalid Discount Amount"
 msgstr ""
 
@@ -23859,7 +23976,7 @@ msgid "Invalid Net Purchase Amount"
 msgstr ""
 
 #: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77
-#: erpnext/accounts/general_ledger.py:820
+#: erpnext/accounts/general_ledger.py:821
 msgid "Invalid Opening Entry"
 msgstr ""
 
@@ -23893,7 +24010,7 @@ msgstr ""
 msgid "Invalid Priority"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1275
+#: erpnext/manufacturing/doctype/bom/bom.py:1276
 msgid "Invalid Process Loss Configuration"
 msgstr ""
 
@@ -23901,12 +24018,12 @@ msgstr ""
 msgid "Invalid Purchase Invoice"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3894
-#: erpnext/controllers/accounts_controller.py:3908
+#: erpnext/controllers/accounts_controller.py:3900
+#: erpnext/controllers/accounts_controller.py:3914
 msgid "Invalid Qty"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1456
+#: erpnext/controllers/accounts_controller.py:1457
 msgid "Invalid Quantity"
 msgstr ""
 
@@ -23940,6 +24057,10 @@ msgstr ""
 msgid "Invalid Source and Target Warehouse"
 msgstr ""
 
+#: erpnext/edi/doctype/code_list/code_list_import.py:37
+msgid "Invalid Upload"
+msgstr ""
+
 #: erpnext/controllers/item_variant.py:145
 msgid "Invalid Value"
 msgstr ""
@@ -23991,8 +24112,8 @@ msgstr ""
 
 #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:109
 #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:119
-#: erpnext/accounts/general_ledger.py:863
-#: erpnext/accounts/general_ledger.py:873
+#: erpnext/accounts/general_ledger.py:864
+#: erpnext/accounts/general_ledger.py:874
 msgid "Invalid value {0} for {1} against account {2}"
 msgstr ""
 
@@ -24024,7 +24145,7 @@ msgstr ""
 #. Label of a Workspace Sidebar Item
 #: erpnext/patches/v15_0/refactor_closing_stock_balance.py:43
 #: erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
-#: erpnext/stock/doctype/inventory_dimension/inventory_dimension.py:175
+#: erpnext/stock/doctype/inventory_dimension/inventory_dimension.py:182
 #: erpnext/workspace_sidebar/stock.json
 msgid "Inventory Dimension"
 msgstr ""
@@ -24111,7 +24232,7 @@ msgstr ""
 msgid "Invoice Document Type Selection Error"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1257
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1265
 msgid "Invoice Grand Total"
 msgstr ""
 
@@ -24214,7 +24335,7 @@ msgstr ""
 
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:171
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:144
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1259
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1267
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:164
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:194
 msgid "Invoiced Amount"
@@ -24416,7 +24537,7 @@ msgstr ""
 
 #. Label of the dn_required (Select) field in DocType 'Selling Settings'
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Is Delivery Note Required for Sales Invoice Creation?"
+msgid "Is Delivery Note required to create Sales Invoice?"
 msgstr ""
 
 #. Label of the is_discounted (Check) field in DocType 'POS Invoice'
@@ -24698,7 +24819,7 @@ msgstr ""
 
 #. Label of the so_required (Select) field in DocType 'Selling Settings'
 #: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Is Sales Order Required for Sales Invoice & Delivery Note Creation?"
+msgid "Is Sales Order required to create Sales Invoice/Delivery Note?"
 msgstr ""
 
 #. Label of the is_short_year (Check) field in DocType 'Fiscal Year'
@@ -24940,7 +25061,6 @@ msgstr ""
 #. Label of the item_code (Link) field in DocType 'Asset Repair Consumed Item'
 #. Label of a Link in the Buying Workspace
 #. Label of the items (Table) field in DocType 'Blanket Order'
-#. Label of the item (Link) field in DocType 'BOM'
 #. Label of a Link in the Manufacturing Workspace
 #. Option for the 'Restrict Items Based On' (Select) field in DocType 'Party
 #. Specific Item'
@@ -24972,10 +25092,9 @@ msgstr ""
 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33
 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:204
 #: erpnext/buying/workspace/buying/buying.json
-#: erpnext/controllers/taxes_and_totals.py:1252
+#: erpnext/controllers/taxes_and_totals.py:1266
 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json
 #: erpnext/manufacturing/doctype/bom/bom.js:1085
-#: erpnext/manufacturing/doctype/bom/bom.json
 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109
 #: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:25
 #: erpnext/manufacturing/report/bom_stock_analysis/bom_stock_analysis.py:101
@@ -24993,7 +25112,7 @@ msgstr ""
 #: erpnext/public/js/stock_analytics.js:92
 #: erpnext/selling/doctype/party_specific_item/party_specific_item.json
 #: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1656
+#: erpnext/selling/doctype/sales_order/sales_order.js:1654
 #: erpnext/selling/page/point_of_sale/pos_item_cart.js:50
 #: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.js:14
 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.js:36
@@ -25279,6 +25398,7 @@ msgstr ""
 #: 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
+#: erpnext/public/js/utils/serial_no_batch_selector.js:96
 #: erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json
 #: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json
 #: erpnext/selling/doctype/installation_note_item/installation_note_item.json
@@ -25286,14 +25406,14 @@ msgstr ""
 #: erpnext/selling/doctype/quotation_item/quotation_item.json
 #: erpnext/selling/doctype/sales_order/sales_order.js:376
 #: erpnext/selling/doctype/sales_order/sales_order.js:484
-#: erpnext/selling/doctype/sales_order/sales_order.js:1261
-#: erpnext/selling/doctype/sales_order/sales_order.js:1425
+#: erpnext/selling/doctype/sales_order/sales_order.js:1259
+#: erpnext/selling/doctype/sales_order/sales_order.js:1423
 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json
 #: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py:29
 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:27
 #: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:19
 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:241
-#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:47
+#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:33
 #: erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:87
 #: erpnext/stock/doctype/bin/bin.json
 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -25508,7 +25628,7 @@ msgstr ""
 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:54
 #: erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py:89
 #: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:41
-#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:54
+#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:35
 #: erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:41
 #: erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:94
 #: erpnext/selling/workspace/selling/selling.json
@@ -25760,7 +25880,7 @@ msgstr ""
 #: erpnext/public/js/controllers/transaction.js:2918
 #: erpnext/public/js/utils.js:831
 #: erpnext/selling/doctype/quotation_item/quotation_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1268
+#: erpnext/selling/doctype/sales_order/sales_order.js:1266
 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json
 #: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py:35
 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:33
@@ -25839,16 +25959,13 @@ msgstr ""
 msgid "Item Price"
 msgstr ""
 
-#: erpnext/stock/get_item_details.py:1118
+#: erpnext/stock/get_item_details.py:1123
 msgid "Item Price Added for {0} in Price List {1}"
 msgstr ""
 
 #. Label of the item_price_settings_section (Section Break) field in DocType
 #. 'Accounts Settings'
-#. Label of the item_price_settings_section (Section Break) field in DocType
-#. 'Selling Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-#: erpnext/selling/doctype/selling_settings/selling_settings.json
 msgid "Item Price Settings"
 msgstr ""
 
@@ -25861,7 +25978,7 @@ msgstr ""
 msgid "Item Price Stock"
 msgstr ""
 
-#: erpnext/stock/get_item_details.py:1141
+#: erpnext/stock/get_item_details.py:1146
 msgid "Item Price added for {0} in Price List {1}"
 msgstr ""
 
@@ -25869,7 +25986,7 @@ msgstr ""
 msgid "Item Price appears multiple times based on Price List, Supplier/Customer, Currency, Item, Batch, UOM, Qty, and Dates."
 msgstr ""
 
-#: erpnext/stock/get_item_details.py:1102
+#: erpnext/stock/get_item_details.py:1107
 msgid "Item Price updated for {0} in Price List {1}"
 msgstr ""
 
@@ -25974,11 +26091,11 @@ msgstr ""
 msgid "Item Tax Rate"
 msgstr ""
 
-#: erpnext/accounts/doctype/item_tax_template/item_tax_template.py:61
+#: erpnext/accounts/doctype/item_tax_template/item_tax_template.py:68
 msgid "Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable"
 msgstr ""
 
-#: erpnext/accounts/doctype/item_tax_template/item_tax_template.py:48
+#: erpnext/accounts/doctype/item_tax_template/item_tax_template.py:55
 msgid "Item Tax Row {0}: Account must belong to Company - {1}"
 msgstr ""
 
@@ -26024,11 +26141,6 @@ msgstr ""
 msgid "Item To Manufacture"
 msgstr ""
 
-#. Label of the uom (Link) field in DocType 'BOM'
-#: erpnext/manufacturing/doctype/bom/bom.json
-msgid "Item UOM"
-msgstr ""
-
 #. Name of a DocType
 #: erpnext/stock/doctype/item_variant/item_variant.json
 msgid "Item Variant"
@@ -26135,7 +26247,7 @@ msgstr ""
 msgid "Item Wise Tax Details"
 msgstr ""
 
-#: erpnext/controllers/taxes_and_totals.py:562
+#: erpnext/controllers/taxes_and_totals.py:573
 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:"
 msgstr ""
 
@@ -26155,7 +26267,7 @@ msgstr ""
 msgid "Item and Warranty Details"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3498
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:3500
 msgid "Item for row {0} does not match Material Request"
 msgstr ""
 
@@ -26176,7 +26288,7 @@ msgid "Item must be added using 'Get Items from Purchase Receipts' button"
 msgstr ""
 
 #: erpnext/buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:42
-#: erpnext/selling/doctype/sales_order/sales_order.js:1663
+#: erpnext/selling/doctype/sales_order/sales_order.js:1661
 msgid "Item name"
 msgstr ""
 
@@ -26185,7 +26297,7 @@ msgstr ""
 msgid "Item operation"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3948
+#: erpnext/controllers/accounts_controller.py:3954
 msgid "Item qty can not be updated as raw materials are already processed."
 msgstr ""
 
@@ -26193,16 +26305,13 @@ msgstr ""
 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}"
 msgstr ""
 
+#. Label of the item (Link) field in DocType 'BOM'
 #. Label of the finished_good (Link) field in DocType 'Job Card'
+#: erpnext/manufacturing/doctype/bom/bom.json
 #: erpnext/manufacturing/doctype/job_card/job_card.json
 msgid "Item to Manufacture"
 msgstr ""
 
-#. Description of the 'Item' (Link) field in DocType 'BOM'
-#: erpnext/manufacturing/doctype/bom/bom.json
-msgid "Item to be manufactured or repacked"
-msgstr ""
-
 #: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js:27
 msgid "Item valuation rate is recalculated considering landed cost voucher amount"
 msgstr ""
@@ -26232,7 +26341,7 @@ msgstr ""
 msgid "Item {0} does not exist"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:708
+#: erpnext/manufacturing/doctype/bom/bom.py:709
 msgid "Item {0} does not exist in the system or has expired"
 msgstr ""
 
@@ -26296,11 +26405,11 @@ msgstr ""
 msgid "Item {0} must be a Fixed Asset Item"
 msgstr ""
 
-#: erpnext/stock/get_item_details.py:349
+#: erpnext/stock/get_item_details.py:351
 msgid "Item {0} must be a Non-Stock Item"
 msgstr ""
 
-#: erpnext/stock/get_item_details.py:346
+#: erpnext/stock/get_item_details.py:348
 msgid "Item {0} must be a Sub-contracted Item"
 msgstr ""
 
@@ -26370,11 +26479,11 @@ msgstr ""
 msgid "Item-wise sales Register"
 msgstr ""
 
-#: erpnext/stock/get_item_details.py:718
+#: erpnext/stock/get_item_details.py:720
 msgid "Item/Item Code required to get Item Tax Template."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:451
+#: erpnext/manufacturing/doctype/bom/bom.py:452
 msgid "Item: {0} does not exist in the system"
 msgstr ""
 
@@ -26395,7 +26504,7 @@ msgid "Items Filter"
 msgstr ""
 
 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:1683
-#: erpnext/selling/doctype/sales_order/sales_order.js:1701
+#: erpnext/selling/doctype/sales_order/sales_order.js:1699
 msgid "Items Required"
 msgstr ""
 
@@ -26418,15 +26527,15 @@ msgstr ""
 msgid "Items and Pricing"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4208
+#: erpnext/controllers/accounts_controller.py:4214
 msgid "Items cannot be updated as Subcontracting Inward Order(s) exist against this Subcontracted Sales Order."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4201
+#: erpnext/controllers/accounts_controller.py:4207
 msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}."
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1461
+#: erpnext/selling/doctype/sales_order/sales_order.js:1459
 msgid "Items for Raw Material Request"
 msgstr ""
 
@@ -26511,7 +26620,7 @@ msgstr ""
 #: erpnext/manufacturing/doctype/job_card/job_card.json
 #: erpnext/manufacturing/doctype/job_card/job_card.py:997
 #: erpnext/manufacturing/doctype/operation/operation.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:410
+#: erpnext/manufacturing/doctype/work_order/work_order.js:415
 #: 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
@@ -26649,7 +26758,7 @@ msgstr ""
 msgid "Job Worker Warehouse"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2684
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2700
 msgid "Job card {0} created"
 msgstr ""
 
@@ -26734,7 +26843,7 @@ msgstr ""
 msgid "Journal Entry Type"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:556
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:557
 msgid "Journal Entry for Asset scrapping cannot be cancelled. Please restore the Asset."
 msgstr ""
 
@@ -26743,11 +26852,11 @@ msgstr ""
 msgid "Journal Entry for Scrap"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:349
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:350
 msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:726
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727
 msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
 msgstr ""
 
@@ -27363,14 +27472,16 @@ msgstr ""
 msgid "Lft"
 msgstr ""
 
-#: erpnext/accounts/report/balance_sheet/balance_sheet.py:252
+#: erpnext/accounts/report/balance_sheet/balance_sheet.py:253
 msgid "Liabilities"
 msgstr ""
 
 #. Option for the 'Root Type' (Select) field in DocType 'Account'
 #. Option for the 'Account Type' (Select) field in DocType 'Account'
+#. Option for the 'Root Type' (Select) field in DocType 'Account Category'
 #. Option for the 'Root Type' (Select) field in DocType 'Ledger Merge'
 #: erpnext/accounts/doctype/account/account.json
+#: erpnext/accounts/doctype/account_category/account_category.json
 #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json
 #: erpnext/accounts/report/account_balance/account_balance.js:26
 msgid "Liability"
@@ -27868,12 +27979,6 @@ msgstr ""
 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
-msgid "Maintain Same Rate Throughout Sales Cycle"
-msgstr ""
-
 #. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings'
 #: erpnext/buying/doctype/buying_settings/buying_settings.json
 msgid "Maintain Same Rate Throughout the Purchase Cycle"
@@ -27884,6 +27989,12 @@ msgstr ""
 msgid "Maintain Stock"
 msgstr ""
 
+#. Label of the maintain_same_sales_rate (Check) field in DocType 'Selling
+#. Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "Maintain same rate throughout sales cycle"
+msgstr ""
+
 #. Group in Asset's connections
 #. Label of a Card Break in the Assets Workspace
 #. Option for the 'Status' (Select) field in DocType 'Workstation'
@@ -27951,7 +28062,7 @@ msgstr ""
 #: erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
 #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js:81
 #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1130
+#: erpnext/selling/doctype/sales_order/sales_order.js:1128
 #: erpnext/support/workspace/support/support.json
 #: erpnext/workspace_sidebar/crm.json erpnext/workspace_sidebar/support.json
 msgid "Maintenance Schedule"
@@ -28058,7 +28169,7 @@ msgstr ""
 #: erpnext/crm/workspace/crm/crm.json
 #: erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js:87
 #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1123
+#: erpnext/selling/doctype/sales_order/sales_order.js:1121
 #: erpnext/support/doctype/warranty_claim/warranty_claim.js:47
 #: erpnext/support/workspace/support/support.json
 #: erpnext/workspace_sidebar/crm.json erpnext/workspace_sidebar/support.json
@@ -28082,8 +28193,8 @@ msgstr ""
 #. Label of the make (Data) field in DocType 'Vehicle'
 #: erpnext/accounts/doctype/journal_entry/journal_entry.js:123
 #: erpnext/manufacturing/doctype/job_card/job_card.js:544
-#: erpnext/manufacturing/doctype/work_order/work_order.js:850
-#: erpnext/manufacturing/doctype/work_order/work_order.js:884
+#: erpnext/manufacturing/doctype/work_order/work_order.js:857
+#: erpnext/manufacturing/doctype/work_order/work_order.js:891
 #: erpnext/setup/doctype/vehicle/vehicle.json
 msgid "Make"
 msgstr ""
@@ -28170,7 +28281,7 @@ msgstr ""
 msgid "Make {0} Variants"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:172
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:173
 msgid "Making Journal Entries against advance accounts: {0} is not recommended. These Journals won't be available for Reconciliation."
 msgstr ""
 
@@ -28459,7 +28570,7 @@ msgstr ""
 msgid "Manufacturing Manager"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2589
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:2587
 msgid "Manufacturing Quantity is mandatory"
 msgstr ""
 
@@ -28681,7 +28792,7 @@ msgstr ""
 msgid "Material"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:875
+#: erpnext/manufacturing/doctype/work_order/work_order.js:882
 msgid "Material Consumption"
 msgstr ""
 
@@ -28776,7 +28887,7 @@ msgstr ""
 #: erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json
 #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
 #: erpnext/manufacturing/doctype/work_order/work_order.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1094
+#: erpnext/selling/doctype/sales_order/sales_order.js:1092
 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json
 #: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:36
 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -28888,7 +28999,7 @@ msgstr ""
 msgid "Material Request {0} is cancelled or stopped"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1477
+#: erpnext/selling/doctype/sales_order/sales_order.js:1475
 msgid "Material Request {0} submitted."
 msgstr ""
 
@@ -28971,8 +29082,10 @@ msgstr ""
 msgid "Material Transferred"
 msgstr ""
 
+#. Option for the 'Based On' (Select) field in DocType 'BOM'
 #. Option for the 'Backflush Raw Materials Based On' (Select) field in DocType
 #. 'Manufacturing Settings'
+#: erpnext/manufacturing/doctype/bom/bom.json
 #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
 msgid "Material Transferred for Manufacture"
 msgstr ""
@@ -29077,9 +29190,9 @@ msgstr ""
 msgid "Max discount allowed for item: {0} is {1}%"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1051
 #: erpnext/manufacturing/doctype/work_order/work_order.js:1058
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1081
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1065
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1088
 #: erpnext/stock/doctype/pick_list/pick_list.js:200
 #: erpnext/stock/doctype/stock_entry/stock_entry.js:382
 msgid "Max: {0}"
@@ -29107,11 +29220,11 @@ msgstr ""
 msgid "Maximum Producible Items"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:4104
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:4106
 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:4095
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:4097
 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}."
 msgstr ""
 
@@ -29187,11 +29300,11 @@ msgstr ""
 msgid "Mention if non-standard receivable account applicable"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.js:151
+#: erpnext/accounts/doctype/account/account.js:169
 msgid "Merge"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.js:45
+#: erpnext/accounts/doctype/account/account.js:55
 msgid "Merge Account"
 msgstr ""
 
@@ -29215,7 +29328,7 @@ msgstr ""
 msgid "Merge taxes from multiple documents"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.js:123
+#: erpnext/accounts/doctype/account/account.js:141
 msgid "Merge with Existing Account"
 msgstr ""
 
@@ -29529,7 +29642,7 @@ msgstr ""
 msgid "Miscellaneous Expenses"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:706
+#: erpnext/controllers/buying_controller.py:713
 msgid "Mismatch"
 msgstr ""
 
@@ -29599,12 +29712,12 @@ msgstr ""
 msgid "Missing email template for dispatch. Please set one in Delivery Settings."
 msgstr ""
 
-#: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:229
+#: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:233
 msgid "Missing required filter: {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1218
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1482
+#: erpnext/manufacturing/doctype/bom/bom.py:1219
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1498
 msgid "Missing value"
 msgstr ""
 
@@ -29790,6 +29903,12 @@ msgstr ""
 msgid "More/Less than 12 months."
 msgstr ""
 
+#. Description of the 'Hide Customer's Tax ID from sales transactions' (Check)
+#. field in DocType 'Selling Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "Most Customers have a unique Tax ID that is fetched into selling transactions. Enable this setting if you do not want Customer Tax IDs to appear in sales transactions."
+msgstr ""
+
 #: erpnext/setup/setup_wizard/data/industry_type.txt:32
 msgid "Motion Picture & Video"
 msgstr ""
@@ -29865,7 +29984,7 @@ msgstr ""
 msgid "Multiple company fields available: {0}. Please select manually."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1302
+#: erpnext/controllers/accounts_controller.py:1303
 msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year"
 msgstr ""
 
@@ -29878,10 +29997,10 @@ msgid "Music"
 msgstr ""
 
 #. Label of the must_be_whole_number (Check) field in DocType 'UOM'
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1429
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1445
 #: erpnext/setup/doctype/uom/uom.json
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:267
-#: erpnext/utilities/transaction_base.py:568
+#: erpnext/utilities/transaction_base.py:571
 msgid "Must be Whole Number"
 msgstr ""
 
@@ -30094,40 +30213,40 @@ msgstr ""
 msgid "Net Asset value as on"
 msgstr ""
 
-#: erpnext/accounts/report/cash_flow/cash_flow.py:177
+#: erpnext/accounts/report/cash_flow/cash_flow.py:178
 msgid "Net Cash from Financing"
 msgstr ""
 
-#: erpnext/accounts/report/cash_flow/cash_flow.py:170
+#: erpnext/accounts/report/cash_flow/cash_flow.py:171
 msgid "Net Cash from Investing"
 msgstr ""
 
-#: erpnext/accounts/report/cash_flow/cash_flow.py:158
+#: erpnext/accounts/report/cash_flow/cash_flow.py:159
 msgid "Net Cash from Operations"
 msgstr ""
 
-#: erpnext/accounts/report/cash_flow/cash_flow.py:163
+#: erpnext/accounts/report/cash_flow/cash_flow.py:164
 msgid "Net Change in Accounts Payable"
 msgstr ""
 
-#: erpnext/accounts/report/cash_flow/cash_flow.py:162
+#: erpnext/accounts/report/cash_flow/cash_flow.py:163
 msgid "Net Change in Accounts Receivable"
 msgstr ""
 
-#: erpnext/accounts/report/cash_flow/cash_flow.py:134
+#: erpnext/accounts/report/cash_flow/cash_flow.py:135
 #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:257
 msgid "Net Change in Cash"
 msgstr ""
 
-#: erpnext/accounts/report/cash_flow/cash_flow.py:179
+#: erpnext/accounts/report/cash_flow/cash_flow.py:180
 msgid "Net Change in Equity"
 msgstr ""
 
-#: erpnext/accounts/report/cash_flow/cash_flow.py:172
+#: erpnext/accounts/report/cash_flow/cash_flow.py:173
 msgid "Net Change in Fixed Asset"
 msgstr ""
 
-#: erpnext/accounts/report/cash_flow/cash_flow.py:164
+#: erpnext/accounts/report/cash_flow/cash_flow.py:165
 msgid "Net Change in Inventory"
 msgstr ""
 
@@ -30140,7 +30259,7 @@ msgstr ""
 
 #: erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py:214
 #: erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py:215
-#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:120
+#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:121
 msgid "Net Profit"
 msgstr ""
 
@@ -30148,7 +30267,7 @@ msgstr ""
 msgid "Net Profit Ratio"
 msgstr ""
 
-#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:185
+#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:186
 msgid "Net Profit/Loss"
 msgstr ""
 
@@ -30317,7 +30436,7 @@ msgstr ""
 msgid "Net Weight UOM"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1662
+#: erpnext/controllers/accounts_controller.py:1663
 msgid "Net total calculation precision loss"
 msgstr ""
 
@@ -30544,7 +30663,7 @@ msgstr ""
 msgid "No <strong>Account Data</strong> row found"
 msgstr ""
 
-#: erpnext/setup/doctype/company/test_company.py:94
+#: erpnext/setup/doctype/company/test_company.py:93
 msgid "No Account matched these filters: {}"
 msgstr ""
 
@@ -30578,11 +30697,11 @@ msgstr ""
 msgid "No Impact on Accounting Ledger"
 msgstr ""
 
-#: erpnext/stock/get_item_details.py:320
+#: erpnext/stock/get_item_details.py:322
 msgid "No Item with Barcode {0}"
 msgstr ""
 
-#: erpnext/stock/get_item_details.py:324
+#: erpnext/stock/get_item_details.py:326
 msgid "No Item with Serial No {0}"
 msgstr ""
 
@@ -30590,11 +30709,11 @@ msgstr ""
 msgid "No Items selected for transfer."
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1242
+#: erpnext/selling/doctype/sales_order/sales_order.js:1240
 msgid "No Items with Bill of Materials to Manufacture or all items already manufactured"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1395
+#: erpnext/selling/doctype/sales_order/sales_order.js:1393
 msgid "No Items with Bill of Materials."
 msgstr ""
 
@@ -30614,9 +30733,9 @@ msgstr ""
 msgid "No POS Profile found. Please create a New POS Profile first"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1573
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1633
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1647
+#: 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/stock/doctype/item/item.py:1401
 msgid "No Permission"
 msgstr ""
@@ -30676,7 +30795,7 @@ msgid "No Work Orders were created"
 msgstr ""
 
 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:832
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:897
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:929
 msgid "No accounting entries for the following warehouses"
 msgstr ""
 
@@ -30712,7 +30831,7 @@ msgstr ""
 msgid "No description given"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:225
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:226
 msgid "No difference found for stock account {0}"
 msgstr ""
 
@@ -30724,6 +30843,10 @@ msgstr ""
 msgid "No employee was scheduled for call popup"
 msgstr ""
 
+#: erpnext/edi/doctype/code_list/code_list_import.py:73
+msgid "No file uploaded or URL provided."
+msgstr ""
+
 #: erpnext/controllers/subcontracting_controller.py:1391
 msgid "No item available for transfer."
 msgstr ""
@@ -30971,7 +31094,7 @@ msgstr ""
 msgid "Non Profit"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1634
+#: erpnext/manufacturing/doctype/bom/bom.py:1635
 msgid "Non stock items"
 msgstr ""
 
@@ -30999,8 +31122,11 @@ msgstr ""
 msgid "Nos"
 msgstr ""
 
+#. Label of the not_applicable (Check) field in DocType 'Item Tax Template
+#. Detail'
 #. Option for the 'Delivery Status' (Select) field in DocType 'Sales Order'
 #. Option for the 'Based On' (Select) field in DocType 'Authorization Rule'
+#: erpnext/accounts/doctype/item_tax_template_detail/item_tax_template_detail.json
 #: erpnext/selling/doctype/sales_order/sales_order.json
 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json
 msgid "Not Applicable"
@@ -31055,7 +31181,7 @@ msgstr ""
 msgid "Not Started"
 msgstr ""
 
-#: erpnext/accounts/report/cash_flow/cash_flow.py:405
+#: erpnext/accounts/report/cash_flow/cash_flow.py:406
 msgid "Not able to find the earliest Fiscal Year for the given company."
 msgstr ""
 
@@ -31105,7 +31231,7 @@ msgstr ""
 msgid "Note: Email will not be sent to disabled users"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:792
+#: erpnext/manufacturing/doctype/bom/bom.py:793
 msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material."
 msgstr ""
 
@@ -31113,7 +31239,7 @@ msgstr ""
 msgid "Note: Item {0} added multiple times"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:708
+#: erpnext/controllers/accounts_controller.py:709
 msgid "Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified"
 msgstr ""
 
@@ -31125,10 +31251,6 @@ msgstr ""
 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1030
-msgid "Note: {0}"
-msgstr ""
-
 #. Label of the notes (Small Text) field in DocType 'Asset Depreciation
 #. Schedule'
 #. Label of the notes (Text) field in DocType 'Contract Fulfilment Checklist'
@@ -31369,7 +31491,7 @@ msgstr ""
 msgid "Offsetting Account"
 msgstr ""
 
-#: erpnext/accounts/general_ledger.py:93
+#: erpnext/accounts/general_ledger.py:94
 msgid "Offsetting for Accounting Dimension"
 msgstr ""
 
@@ -31487,7 +31609,7 @@ msgstr ""
 msgid "Once set, this invoice will be on hold till the set date"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:762
+#: erpnext/manufacturing/doctype/work_order/work_order.js:769
 msgid "Once the Work Order is Closed. It can't be resumed."
 msgstr ""
 
@@ -31579,7 +31701,7 @@ msgstr ""
 msgid "Only one of Deposit or Withdrawal should be non-zero when applying an Excluded Fee."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:329
+#: erpnext/manufacturing/doctype/bom/bom.py:330
 msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled."
 msgstr ""
 
@@ -31816,7 +31938,7 @@ msgstr ""
 msgid "Opening Entry"
 msgstr ""
 
-#: erpnext/accounts/general_ledger.py:819
+#: erpnext/accounts/general_ledger.py:820
 msgid "Opening Entry can not be created after Period Closing Voucher is created."
 msgstr ""
 
@@ -31937,7 +32059,7 @@ msgstr ""
 msgid "Operating Cost Per BOM Quantity"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1721
+#: erpnext/manufacturing/doctype/bom/bom.py:1722
 msgid "Operating Cost as per Work Order / BOM"
 msgstr ""
 
@@ -31985,7 +32107,7 @@ msgstr ""
 msgid "Operation ID"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:346
+#: erpnext/manufacturing/doctype/work_order/work_order.js:351
 msgid "Operation Id"
 msgstr ""
 
@@ -32013,7 +32135,7 @@ msgstr ""
 msgid "Operation Time"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1488
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1504
 msgid "Operation Time must be greater than 0 for Operation {0}"
 msgstr ""
 
@@ -32048,7 +32170,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:327
+#: erpnext/manufacturing/doctype/work_order/work_order.js:332
 #: erpnext/manufacturing/doctype/work_order/work_order.json
 #: erpnext/setup/doctype/company/company.py:469
 #: erpnext/setup/doctype/email_digest/email_digest.json
@@ -32062,7 +32184,7 @@ msgstr ""
 msgid "Operations Routing"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1227
+#: erpnext/manufacturing/doctype/bom/bom.py:1228
 msgid "Operations cannot be left blank"
 msgstr ""
 
@@ -32223,7 +32345,7 @@ msgstr ""
 msgid "Optimize Route"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1028
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1035
 msgid "Optional. Select a specific manufacture entry to reverse."
 msgstr ""
 
@@ -32265,6 +32387,7 @@ msgstr ""
 
 #. Label of the order_date (Date) field in DocType 'Blanket Order'
 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json
+#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:68
 msgid "Order Date"
 msgstr ""
 
@@ -32587,7 +32710,7 @@ msgstr ""
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:149
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1266
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1274
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:167
 #: erpnext/accounts/report/purchase_register/purchase_register.py:289
 #: erpnext/accounts/report/sales_register/sales_register.py:319
@@ -32677,7 +32800,7 @@ msgstr ""
 msgid "Overbilling of {0} {1} ignored for item {2} because you have {3} role."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2178
+#: erpnext/controllers/accounts_controller.py:2181
 msgid "Overbilling of {} ignored because you have {} role."
 msgstr ""
 
@@ -32734,7 +32857,7 @@ msgstr ""
 msgid "Overlap in scoring between {0} and {1}"
 msgstr ""
 
-#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:201
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:206
 msgid "Overlapping conditions found between:"
 msgstr ""
 
@@ -33223,7 +33346,7 @@ msgstr ""
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:146
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1260
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1268
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:201
 #: erpnext/accounts/report/pos_register/pos_register.py:209
@@ -33476,7 +33599,7 @@ msgstr ""
 msgid "Parsed file is not in valid MT940 format or contains no transactions."
 msgstr ""
 
-#: erpnext/edi/doctype/code_list/code_list_import.py:45
+#: erpnext/edi/doctype/code_list/code_list_import.py:44
 msgid "Parsing Error"
 msgstr ""
 
@@ -33679,13 +33802,13 @@ msgstr ""
 #: erpnext/accounts/doctype/tax_category/tax_category_dashboard.py:11
 #: erpnext/accounts/doctype/tax_withholding_entry/tax_withholding_entry.json
 #: erpnext/accounts/doctype/unreconcile_payment_entries/unreconcile_payment_entries.json
-#: erpnext/accounts/report/accounts_payable/accounts_payable.js:94
-#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:71
+#: erpnext/accounts/report/accounts_payable/accounts_payable.js:105
+#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:82
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:142
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:159
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:54
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1197
-#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:71
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:65
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1204
+#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:82
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:147
 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49
 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240
@@ -33711,7 +33834,7 @@ msgstr ""
 
 #. Name of a DocType
 #: erpnext/accounts/doctype/party_account/party_account.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1208
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1215
 msgid "Party Account"
 msgstr ""
 
@@ -33738,7 +33861,7 @@ msgstr ""
 msgid "Party Account No. (Bank Statement)"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2462
+#: erpnext/controllers/accounts_controller.py:2465
 msgid "Party Account {0} currency ({1}) and document currency ({2}) should be same"
 msgstr ""
 
@@ -33865,11 +33988,11 @@ msgstr ""
 #: erpnext/accounts/doctype/subscription/subscription.json
 #: erpnext/accounts/doctype/tax_withholding_entry/tax_withholding_entry.json
 #: erpnext/accounts/doctype/unreconcile_payment_entries/unreconcile_payment_entries.json
-#: erpnext/accounts/report/accounts_payable/accounts_payable.js:81
-#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:58
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:41
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1191
-#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:58
+#: erpnext/accounts/report/accounts_payable/accounts_payable.js:92
+#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:69
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:52
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1198
+#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:69
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:141
 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42
 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:231
@@ -34010,8 +34133,8 @@ msgstr ""
 msgid "Payable"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_payable/accounts_payable.js:39
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1206
+#: erpnext/accounts/report/accounts_payable/accounts_payable.js:50
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1213
 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:209
 #: erpnext/accounts/report/purchase_register/purchase_register.py:194
 #: erpnext/accounts/report/purchase_register/purchase_register.py:235
@@ -34046,7 +34169,7 @@ msgstr ""
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:42
 #: erpnext/buying/doctype/purchase_order/purchase_order.js:421
 #: erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py:24
-#: erpnext/selling/doctype/sales_order/sales_order.js:1175
+#: erpnext/selling/doctype/sales_order/sales_order.js:1173
 #: erpnext/selling/doctype/sales_order/sales_order_dashboard.py:31
 msgid "Payment"
 msgstr ""
@@ -34174,7 +34297,7 @@ msgstr ""
 msgid "Payment Entry is already created"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1613
+#: erpnext/controllers/accounts_controller.py:1614
 msgid "Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice."
 msgstr ""
 
@@ -34398,7 +34521,7 @@ msgstr ""
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:135
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:139
 #: erpnext/buying/doctype/purchase_order/purchase_order.js:429
-#: erpnext/selling/doctype/sales_order/sales_order.js:1168
+#: erpnext/selling/doctype/sales_order/sales_order.js:1166
 #: erpnext/workspace_sidebar/invoicing.json
 #: erpnext/workspace_sidebar/payments.json
 msgid "Payment Request"
@@ -34454,7 +34577,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:2742
+#: erpnext/controllers/accounts_controller.py:2745
 #: erpnext/selling/doctype/quotation/quotation.json
 #: erpnext/selling/doctype/sales_order/sales_order.json
 msgid "Payment Schedule"
@@ -34487,7 +34610,7 @@ msgstr ""
 #: erpnext/accounts/doctype/payment_schedule/payment_schedule.json
 #: erpnext/accounts/doctype/payment_term/payment_term.json
 #: erpnext/accounts/doctype/payment_terms_template_detail/payment_terms_template_detail.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1256
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1264
 #: erpnext/accounts/report/gross_profit/gross_profit.py:449
 #: erpnext/accounts/workspace/invoicing/invoicing.json
 #: erpnext/public/js/controllers/transaction.js:498
@@ -34551,10 +34674,10 @@ msgstr ""
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/accounts/report/accounts_payable/accounts_payable.js:75
-#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:85
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:113
-#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:91
+#: erpnext/accounts/report/accounts_payable/accounts_payable.js:86
+#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:96
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:124
+#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:102
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:62
 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:61
 #: erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -34599,7 +34722,7 @@ msgstr ""
 msgid "Payment Unlink Error"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:898
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:899
 msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
 msgstr ""
 
@@ -34737,9 +34860,9 @@ msgstr ""
 #. Label of the pending_qty (Float) field in DocType 'Production Plan Item'
 #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:254
 #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:351
+#: erpnext/manufacturing/doctype/work_order/work_order.js:356
 #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:182
-#: erpnext/selling/doctype/sales_order/sales_order.js:1670
+#: erpnext/selling/doctype/sales_order/sales_order.js:1668
 #: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:45
 msgid "Pending Qty"
 msgstr ""
@@ -34873,7 +34996,7 @@ msgstr ""
 msgid "Period Based On"
 msgstr ""
 
-#: erpnext/accounts/general_ledger.py:831
+#: erpnext/accounts/general_ledger.py:832
 msgid "Period Closed"
 msgstr ""
 
@@ -34999,7 +35122,7 @@ msgstr ""
 msgid "Periodic Accounting Entry"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:251
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:252
 msgid "Periodic Accounting Entry is not allowed for company {0} with perpetual inventory enabled"
 msgstr ""
 
@@ -35106,7 +35229,7 @@ msgstr ""
 #. Reservation Entry'
 #. Label of a Link in the Stock Workspace
 #. Label of a Workspace Sidebar Item
-#: erpnext/selling/doctype/sales_order/sales_order.js:1030
+#: erpnext/selling/doctype/sales_order/sales_order.js:1028
 #: erpnext/stock/doctype/delivery_note/delivery_note.js:199
 #: erpnext/stock/doctype/material_request/material_request.js:156
 #: erpnext/stock/doctype/pick_list/pick_list.json
@@ -35496,7 +35619,7 @@ msgstr ""
 msgid "Please add a Temporary Opening account in Chart of Accounts"
 msgstr ""
 
-#: erpnext/public/js/utils/serial_no_batch_selector.js:649
+#: erpnext/public/js/utils/serial_no_batch_selector.js:660
 msgid "Please add atleast one Serial No / Batch No"
 msgstr ""
 
@@ -35542,7 +35665,7 @@ msgstr ""
 msgid "Please capitalize this asset before submitting."
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:972
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:973
 msgid "Please check Multi Currency option to allow accounts with other currency"
 msgstr ""
 
@@ -35611,7 +35734,7 @@ msgstr ""
 msgid "Please create a new Accounting Dimension if required."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:801
+#: erpnext/controllers/accounts_controller.py:802
 msgid "Please create purchase from internal sale or delivery document itself"
 msgstr ""
 
@@ -35741,7 +35864,7 @@ msgstr ""
 msgid "Please enter Receipt Document"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1036
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1037
 msgid "Please enter Reference date"
 msgstr ""
 
@@ -35753,7 +35876,7 @@ msgstr ""
 msgid "Please enter Serial No"
 msgstr ""
 
-#: erpnext/public/js/utils/serial_no_batch_selector.js:308
+#: erpnext/public/js/utils/serial_no_batch_selector.js:319
 msgid "Please enter Serial Nos"
 msgstr ""
 
@@ -35770,7 +35893,7 @@ msgstr ""
 msgid "Please enter Write Off Account"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:725
+#: erpnext/selling/doctype/sales_order/sales_order.js:723
 msgid "Please enter a valid number of deliveries"
 msgstr ""
 
@@ -35786,7 +35909,7 @@ msgstr ""
 msgid "Please enter company name first"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2968
+#: erpnext/controllers/accounts_controller.py:2971
 msgid "Please enter default currency in Company Master"
 msgstr ""
 
@@ -35818,7 +35941,7 @@ msgstr ""
 msgid "Please enter the company name to confirm"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:721
+#: erpnext/selling/doctype/sales_order/sales_order.js:720
 msgid "Please enter the first delivery date"
 msgstr ""
 
@@ -35826,7 +35949,7 @@ msgstr ""
 msgid "Please enter the phone number first"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:1189
+#: erpnext/controllers/buying_controller.py:1196
 msgid "Please enter the {schedule_date}."
 msgstr ""
 
@@ -35890,8 +36013,8 @@ msgstr ""
 msgid "Please mention 'Weight UOM' along with Weight."
 msgstr ""
 
-#: erpnext/accounts/general_ledger.py:665
-#: erpnext/accounts/general_ledger.py:672
+#: erpnext/accounts/general_ledger.py:666
+#: erpnext/accounts/general_ledger.py:673
 msgid "Please mention '{0}' in Company: {1}"
 msgstr ""
 
@@ -35928,7 +36051,7 @@ msgstr ""
 msgid "Please save first"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:867
+#: erpnext/selling/doctype/sales_order/sales_order.js:865
 msgid "Please save the Sales Order before adding a delivery schedule."
 msgstr ""
 
@@ -35936,8 +36059,8 @@ msgstr ""
 msgid "Please select <b>Template Type</b> to download template"
 msgstr ""
 
-#: erpnext/controllers/taxes_and_totals.py:849
-#: erpnext/public/js/controllers/taxes_and_totals.js:794
+#: erpnext/controllers/taxes_and_totals.py:863
+#: erpnext/public/js/controllers/taxes_and_totals.js:813
 msgid "Please select Apply Discount On"
 msgstr ""
 
@@ -35949,7 +36072,7 @@ msgstr ""
 msgid "Please select BOM for Item in Row {0}"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:640
+#: erpnext/controllers/buying_controller.py:647
 msgid "Please select BOM in BOM field for Item {item_code}."
 msgstr ""
 
@@ -35976,7 +36099,7 @@ msgstr ""
 msgid "Please select Company and Posting Date to getting entries"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.js:732
+#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738
 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28
 msgid "Please select Company first"
 msgstr ""
@@ -36017,7 +36140,7 @@ msgstr ""
 msgid "Please select Party Type first"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:257
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:258
 msgid "Please select Periodic Accounting Entry Difference Account"
 msgstr ""
 
@@ -36025,11 +36148,11 @@ msgstr ""
 msgid "Please select Posting Date before selecting Party"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.js:733
+#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739
 msgid "Please select Posting Date first"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1291
+#: erpnext/manufacturing/doctype/bom/bom.py:1292
 msgid "Please select Price List"
 msgstr ""
 
@@ -36049,7 +36172,7 @@ msgstr ""
 msgid "Please select Start Date and End Date for Item {0}"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:276
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:277
 msgid "Please select Stock Asset Account"
 msgstr ""
 
@@ -36057,11 +36180,11 @@ msgstr ""
 msgid "Please select Subcontracting Order instead of Purchase Order {0}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2817
+#: erpnext/controllers/accounts_controller.py:2820
 msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1546
+#: erpnext/manufacturing/doctype/bom/bom.py:1547
 msgid "Please select a BOM"
 msgstr ""
 
@@ -36072,7 +36195,7 @@ msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:268
 #: erpnext/manufacturing/doctype/bom/bom.js:727
-#: erpnext/manufacturing/doctype/bom/bom.py:278
+#: erpnext/manufacturing/doctype/bom/bom.py:279
 #: erpnext/public/js/controllers/accounts.js:277
 #: erpnext/public/js/controllers/transaction.js:3373
 msgid "Please select a Company first."
@@ -36094,7 +36217,7 @@ msgstr ""
 msgid "Please select a Supplier"
 msgstr ""
 
-#: erpnext/public/js/utils/serial_no_batch_selector.js:653
+#: erpnext/public/js/utils/serial_no_batch_selector.js:664
 msgid "Please select a Warehouse"
 msgstr ""
 
@@ -36102,6 +36225,10 @@ msgstr ""
 msgid "Please select a Work Order first."
 msgstr ""
 
+#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:53
+msgid "Please select a company."
+msgstr ""
+
 #: erpnext/setup/doctype/holiday_list/holiday_list.py:89
 msgid "Please select a country"
 msgstr ""
@@ -36171,15 +36298,15 @@ msgstr ""
 msgid "Please select at least one schedule."
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1312
+#: erpnext/selling/doctype/sales_order/sales_order.js:1310
 msgid "Please select atleast one item to continue"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:394
+#: erpnext/manufacturing/doctype/work_order/work_order.js:399
 msgid "Please select atleast one operation to create Job Card"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1712
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1713
 msgid "Please select correct account"
 msgstr ""
 
@@ -36233,13 +36360,15 @@ msgstr ""
 msgid "Please select the customer."
 msgstr ""
 
-#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:21
-#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:21
 #: erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py:43
 #: erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:54
 msgid "Please select the document type first"
 msgstr ""
 
+#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:47
+msgid "Please select the document type first."
+msgstr ""
+
 #: erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py:21
 msgid "Please select the required filters"
 msgstr ""
@@ -36269,7 +36398,7 @@ msgstr ""
 msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
 msgstr ""
 
-#: erpnext/accounts/general_ledger.py:559
+#: erpnext/accounts/general_ledger.py:560
 msgid "Please set '{0}' in Company: {1}"
 msgstr ""
 
@@ -36337,7 +36466,7 @@ msgstr ""
 msgid "Please set Parent Row No for item {0}"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:352
+#: erpnext/controllers/buying_controller.py:356
 msgid "Please set Purchase Expense Contra Account in Company {0}"
 msgstr ""
 
@@ -36424,7 +36553,7 @@ msgstr ""
 msgid "Please set default Cash or Bank account in Mode of Payments {}"
 msgstr ""
 
-#: erpnext/accounts/utils.py:2527
+#: erpnext/accounts/utils.py:2528
 msgid "Please set default Exchange Gain/Loss Account in Company {}"
 msgstr ""
 
@@ -36453,7 +36582,7 @@ msgstr ""
 msgid "Please set filter based on Item or Warehouse"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2378
+#: erpnext/controllers/accounts_controller.py:2381
 msgid "Please set one of the following:"
 msgstr ""
 
@@ -36473,7 +36602,7 @@ msgstr ""
 msgid "Please set the Default Cost Center in {0} company."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:679
+#: erpnext/manufacturing/doctype/work_order/work_order.js:686
 msgid "Please set the Item Code first"
 msgstr ""
 
@@ -36520,7 +36649,7 @@ msgstr ""
 msgid "Please set {0} in Company {1} to account for Exchange Gain / Loss"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:590
+#: erpnext/controllers/accounts_controller.py:591
 msgid "Please set {0} to {1}, the same account that was used in the original invoice {2}."
 msgstr ""
 
@@ -36532,7 +36661,7 @@ msgstr ""
 msgid "Please share this email with your support team so that they can find and fix the issue."
 msgstr ""
 
-#: erpnext/stock/get_item_details.py:331
+#: erpnext/stock/get_item_details.py:333
 msgid "Please specify Company"
 msgstr ""
 
@@ -36542,7 +36671,7 @@ msgstr ""
 msgid "Please specify Company to proceed"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3199
+#: erpnext/controllers/accounts_controller.py:3202
 #: erpnext/public/js/controllers/accounts.js:117
 msgid "Please specify a valid Row ID for row {0} in table {1}"
 msgstr ""
@@ -36732,7 +36861,7 @@ msgstr ""
 #: erpnext/accounts/report/accounts_payable/accounts_payable.js:16
 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:15
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:18
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1189
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1196
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:15
 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:38
 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:7
@@ -36756,8 +36885,7 @@ msgstr ""
 #: erpnext/manufacturing/report/job_card_summary/job_card_summary.py:134
 #: erpnext/public/js/purchase_trends_filters.js:38
 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:25
-#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:51
-#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:45
+#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:68
 #: erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py:67
 #: erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:85
 #: erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json
@@ -36788,7 +36916,7 @@ msgid "Posting Date Inheritance for Exchange Gain / Loss"
 msgstr ""
 
 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:269
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:142
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:144
 msgid "Posting Date cannot be future date"
 msgstr ""
 
@@ -36999,6 +37127,12 @@ msgstr ""
 msgid "Preventive Maintenance"
 msgstr ""
 
+#. Description of the 'Don't reserve Sales Order qty on sales return' (Check)
+#. field in DocType 'Selling Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns."
+msgstr ""
+
 #. Label of the preview (Button) field in DocType 'Request for Quotation'
 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267
 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -37011,7 +37145,7 @@ msgstr ""
 msgid "Preview Required Materials"
 msgstr ""
 
-#: erpnext/accounts/report/balance_sheet/balance_sheet.py:181
+#: erpnext/accounts/report/balance_sheet/balance_sheet.py:182
 #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:142
 msgid "Previous Financial Year is not closed"
 msgstr ""
@@ -37135,7 +37269,7 @@ msgstr ""
 msgid "Price List Currency"
 msgstr ""
 
-#: erpnext/stock/get_item_details.py:1315
+#: erpnext/stock/get_item_details.py:1320
 msgid "Price List Currency not selected"
 msgstr ""
 
@@ -37260,7 +37394,7 @@ msgstr ""
 msgid "Price is not set for the item."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:604
+#: erpnext/manufacturing/doctype/bom/bom.py:605
 msgid "Price not found for item {0} in price list {1}"
 msgstr ""
 
@@ -37627,10 +37761,8 @@ msgstr ""
 msgid "Process Description"
 msgstr ""
 
-#. Label of the process_loss_section (Section Break) field in DocType 'BOM'
 #. Label of the section_break_7qsm (Section Break) field in DocType 'Stock
 #. Entry'
-#: erpnext/manufacturing/doctype/bom/bom.json
 #: erpnext/stock/doctype/stock_entry/stock_entry.json
 msgid "Process Loss"
 msgstr ""
@@ -37641,7 +37773,7 @@ msgstr ""
 msgid "Process Loss %"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1271
+#: erpnext/manufacturing/doctype/bom/bom.py:1272
 msgid "Process Loss Percentage cannot be greater than 100"
 msgstr ""
 
@@ -37967,7 +38099,7 @@ msgstr ""
 #: erpnext/manufacturing/doctype/work_order/work_order.json
 #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.js:8
 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1066
+#: erpnext/selling/doctype/sales_order/sales_order.js:1064
 #: erpnext/stock/doctype/material_request_item/material_request_item.json
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
@@ -38057,7 +38189,7 @@ msgstr ""
 msgid "Profit & Loss"
 msgstr ""
 
-#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:116
+#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:117
 msgid "Profit This Year"
 msgstr ""
 
@@ -38094,8 +38226,8 @@ msgstr ""
 msgid "Profit and Loss Summary"
 msgstr ""
 
-#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:140
 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:141
+#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:142
 msgid "Profit for the year"
 msgstr ""
 
@@ -38248,7 +38380,7 @@ msgstr ""
 msgid "Project wise Stock Tracking "
 msgstr ""
 
-#: erpnext/controllers/trends.py:429
+#: erpnext/controllers/trends.py:435
 msgid "Project-wise data is not available for Quotation"
 msgstr ""
 
@@ -38470,9 +38602,9 @@ msgstr ""
 msgid "Provisional Expense Account"
 msgstr ""
 
-#: erpnext/accounts/report/balance_sheet/balance_sheet.py:158
 #: erpnext/accounts/report/balance_sheet/balance_sheet.py:159
-#: erpnext/accounts/report/balance_sheet/balance_sheet.py:226
+#: erpnext/accounts/report/balance_sheet/balance_sheet.py:160
+#: erpnext/accounts/report/balance_sheet/balance_sheet.py:227
 msgid "Provisional Profit / Loss (Credit)"
 msgstr ""
 
@@ -38596,8 +38728,8 @@ msgstr ""
 msgid "Purchase Expense Contra Account"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:362
-#: erpnext/controllers/buying_controller.py:376
+#: erpnext/controllers/buying_controller.py:366
+#: erpnext/controllers/buying_controller.py:380
 msgid "Purchase Expense for Item {0}"
 msgstr ""
 
@@ -38725,12 +38857,12 @@ 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:922
+#: erpnext/controllers/buying_controller.py:929
 #: erpnext/crm/doctype/contract/contract.json
 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:54
 #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
 #: erpnext/selling/doctype/sales_order/sales_order.js:189
-#: erpnext/selling/doctype/sales_order/sales_order.js:1113
+#: erpnext/selling/doctype/sales_order/sales_order.js:1111
 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json
 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json
 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -38800,7 +38932,7 @@ msgstr ""
 msgid "Purchase Order Item Supplied"
 msgstr ""
 
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1012
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1044
 msgid "Purchase Order Item reference is missing in Subcontracting Receipt {0}"
 msgstr ""
 
@@ -38831,7 +38963,7 @@ msgstr ""
 msgid "Purchase Order Trends"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1614
+#: erpnext/selling/doctype/sales_order/sales_order.js:1612
 msgid "Purchase Order already created for all Sales Order items"
 msgstr ""
 
@@ -38877,7 +39009,7 @@ msgstr ""
 msgid "Purchase Orders to Receive"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2010
+#: erpnext/controllers/accounts_controller.py:2013
 msgid "Purchase Orders {0} are un-linked"
 msgstr ""
 
@@ -38988,7 +39120,7 @@ msgstr ""
 msgid "Purchase Receipt doesn't have any Item for which Retain Sample is enabled."
 msgstr ""
 
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1088
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1120
 msgid "Purchase Receipt {0} created."
 msgstr ""
 
@@ -39179,8 +39311,8 @@ msgstr ""
 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json
 #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240
 #: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:224
-#: erpnext/controllers/trends.py:276 erpnext/controllers/trends.py:288
-#: erpnext/controllers/trends.py:293
+#: erpnext/controllers/trends.py:282 erpnext/controllers/trends.py:294
+#: erpnext/controllers/trends.py:299
 #: erpnext/crm/doctype/opportunity_item/opportunity_item.json
 #: erpnext/manufacturing/doctype/bom/bom.js:1105
 #: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
@@ -39205,8 +39337,8 @@ msgstr ""
 #: erpnext/selling/doctype/sales_order/sales_order.js:502
 #: erpnext/selling/doctype/sales_order/sales_order.js:592
 #: erpnext/selling/doctype/sales_order/sales_order.js:639
-#: erpnext/selling/doctype/sales_order/sales_order.js:1288
-#: erpnext/selling/doctype/sales_order/sales_order.js:1450
+#: erpnext/selling/doctype/sales_order/sales_order.js:1286
+#: erpnext/selling/doctype/sales_order/sales_order.js:1448
 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:255
 #: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
 #: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
@@ -39316,7 +39448,7 @@ msgstr ""
 msgid "Qty To Manufacture"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1425
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1441
 msgid "Qty To Manufacture ({0}) cannot be a fraction for the UOM {2}. To allow this, disable '{1}' in the UOM {2}."
 msgstr ""
 
@@ -39371,8 +39503,8 @@ msgstr ""
 msgid "Qty for which recursion isn't applicable."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1056
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1079
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1063
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1086
 msgid "Qty for {0}"
 msgstr ""
 
@@ -39423,7 +39555,7 @@ msgstr ""
 msgid "Qty to Disassemble"
 msgstr ""
 
-#: erpnext/public/js/utils/serial_no_batch_selector.js:373
+#: erpnext/public/js/utils/serial_no_batch_selector.js:384
 msgid "Qty to Fetch"
 msgstr ""
 
@@ -39561,7 +39693,6 @@ msgstr ""
 #. Label of the quality_inspection (Link) field in DocType 'Sales Invoice Item'
 #. Label of the quality_inspection_section_break (Section Break) field in
 #. DocType 'BOM'
-#. Label of the quality_inspection_tab (Tab Break) field in DocType 'BOM'
 #. Label of the quality_inspection (Link) field in DocType 'Job Card'
 #. Label of the quality_inspection_section (Section Break) field in DocType
 #. 'Job Card'
@@ -39773,7 +39904,6 @@ msgstr ""
 #. Label of the qty (Float) field in DocType 'Request for Quotation Item'
 #. Label of the qty (Float) field in DocType 'Supplier Quotation Item'
 #. Label of the qty (Float) field in DocType 'Blanket Order Item'
-#. Label of the quantity (Float) field in DocType 'BOM'
 #. Label of the qty (Float) field in DocType 'BOM Creator'
 #. Label of the section_break_4rxf (Section Break) field in DocType 'Production
 #. Plan Sub Assembly Item'
@@ -39812,7 +39942,6 @@ msgstr ""
 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:213
 #: erpnext/manufacturing/doctype/blanket_order_item/blanket_order_item.json
 #: erpnext/manufacturing/doctype/bom/bom.js:493
-#: erpnext/manufacturing/doctype/bom/bom.json
 #: erpnext/manufacturing/doctype/bom_creator/bom_creator.js:76
 #: erpnext/manufacturing/doctype/bom_creator/bom_creator.json
 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:194
@@ -39820,13 +39949,13 @@ msgstr ""
 #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
 #: erpnext/public/js/controllers/buying.js:615
 #: erpnext/public/js/stock_analytics.js:50
-#: erpnext/public/js/utils/serial_no_batch_selector.js:486
+#: erpnext/public/js/utils/serial_no_batch_selector.js:497
 #: 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_cart.js:51
 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:42
 #: erpnext/selling/report/sales_analytics/sales_analytics.js:44
-#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:67
+#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:39
 #: erpnext/stock/dashboard/item_dashboard.js:248
 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
 #: erpnext/stock/doctype/material_request/material_request.js:368
@@ -39866,6 +39995,11 @@ msgstr ""
 msgid "Quantity (A - B)"
 msgstr ""
 
+#. Label of the quantity (Float) field in DocType 'BOM'
+#: erpnext/manufacturing/doctype/bom/bom.json
+msgid "Quantity (Output Qty)"
+msgstr ""
+
 #. Label of the quantity_difference (Read Only) field in DocType 'Stock
 #. Reconciliation Item'
 #: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
@@ -39948,36 +40082,31 @@ msgstr ""
 msgid "Quantity must be less than or equal to {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1109
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1116
 #: erpnext/stock/doctype/pick_list/pick_list.js:206
 msgid "Quantity must not be more than {0}"
 msgstr ""
 
-#. Description of the 'Quantity' (Float) field in DocType 'BOM'
-#: erpnext/manufacturing/doctype/bom/bom.json
-msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
-msgstr ""
-
-#: erpnext/manufacturing/doctype/bom/bom.py:772
+#: erpnext/manufacturing/doctype/bom/bom.py:773
 msgid "Quantity required for Item {0} in row {1}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:716
+#: erpnext/manufacturing/doctype/bom/bom.py:717
 #: erpnext/manufacturing/doctype/job_card/job_card.js:393
 #: erpnext/manufacturing/doctype/job_card/job_card.js:463
 #: erpnext/manufacturing/doctype/workstation/workstation.js:303
 msgid "Quantity should be greater than 0"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:356
+#: erpnext/manufacturing/doctype/work_order/work_order.js:361
 msgid "Quantity to Manufacture"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2622
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2638
 msgid "Quantity to Manufacture can not be zero for the operation {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1417
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1433
 msgid "Quantity to Manufacture must be greater than 0."
 msgstr ""
 
@@ -40067,7 +40196,7 @@ msgstr ""
 #: erpnext/crm/report/lead_details/lead_details.js:37
 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:38
 #: erpnext/selling/doctype/quotation/quotation.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1191
+#: erpnext/selling/doctype/sales_order/sales_order.js:1189
 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json
 #: erpnext/selling/workspace/selling/selling.json
 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json
@@ -40255,7 +40384,7 @@ msgstr ""
 #: erpnext/selling/doctype/quotation_item/quotation_item.json
 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json
 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:45
-#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:68
+#: 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_price/item_price.json
@@ -40432,7 +40561,7 @@ msgstr ""
 msgid "Rate at which this tax is applied"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4074
+#: erpnext/controllers/accounts_controller.py:4080
 msgid "Rate of '{}' items cannot be changed"
 msgstr ""
 
@@ -40569,12 +40698,10 @@ msgstr ""
 msgid "Raw Material Warehouse"
 msgstr ""
 
-#. Label of the materials_section (Section Break) field in DocType 'BOM'
 #. Label of the section_break_8 (Section Break) field in DocType 'Job Card'
 #. Label of the mr_items (Table) field in DocType 'Production Plan'
 #: erpnext/manufacturing/doctype/bom/bom.js:446
 #: erpnext/manufacturing/doctype/bom/bom.js:1078
-#: erpnext/manufacturing/doctype/bom/bom.json
 #: erpnext/manufacturing/doctype/job_card/job_card.json
 #: erpnext/manufacturing/doctype/production_plan/production_plan.json
 #: erpnext/manufacturing/doctype/workstation/workstation.js:462
@@ -40637,7 +40764,7 @@ msgstr ""
 msgid "Raw Materials Supplied Cost"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:764
+#: erpnext/manufacturing/doctype/bom/bom.py:765
 msgid "Raw Materials cannot be blank."
 msgstr ""
 
@@ -40659,8 +40786,8 @@ 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:778
-#: erpnext/selling/doctype/sales_order/sales_order.js:976
+#: erpnext/manufacturing/doctype/work_order/work_order.js:785
+#: 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
 #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.js:116
@@ -40759,7 +40886,7 @@ msgid "Reason for Failure"
 msgstr ""
 
 #: erpnext/buying/doctype/purchase_order/purchase_order.js:679
-#: erpnext/selling/doctype/sales_order/sales_order.js:1785
+#: erpnext/selling/doctype/sales_order/sales_order.js:1783
 msgid "Reason for Hold"
 msgstr ""
 
@@ -40768,7 +40895,7 @@ msgstr ""
 msgid "Reason for Leaving"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1800
+#: erpnext/selling/doctype/sales_order/sales_order.js:1798
 msgid "Reason for hold:"
 msgstr ""
 
@@ -40839,8 +40966,8 @@ msgstr ""
 msgid "Receivable / Payable Account"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:68
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1204
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:79
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1211
 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:241
 #: erpnext/accounts/report/sales_register/sales_register.py:217
 #: erpnext/accounts/report/sales_register/sales_register.py:271
@@ -41202,7 +41329,7 @@ msgstr ""
 msgid "Ref Date"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1034
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1035
 msgid "Reference #{0} dated {1}"
 msgstr ""
 
@@ -41240,7 +41367,7 @@ msgstr ""
 msgid "Reference No"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:648
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:649
 msgid "Reference No & Reference Date is required for {0}"
 msgstr ""
 
@@ -41248,11 +41375,11 @@ msgstr ""
 msgid "Reference No and Reference Date is mandatory for Bank transaction"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:653
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:654
 msgid "Reference No is mandatory if you entered Reference Date"
 msgstr ""
 
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:193
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:265
 msgid "Reference No."
 msgstr ""
 
@@ -41397,7 +41524,7 @@ msgstr ""
 msgid "Regular"
 msgstr ""
 
-#: erpnext/stock/doctype/inventory_dimension/inventory_dimension.py:202
+#: erpnext/stock/doctype/inventory_dimension/inventory_dimension.py:209
 msgid "Rejected "
 msgstr ""
 
@@ -41457,7 +41584,7 @@ msgstr ""
 msgid "Rejected Warehouse"
 msgstr ""
 
-#: erpnext/public/js/utils/serial_no_batch_selector.js:657
+#: erpnext/public/js/utils/serial_no_batch_selector.js:668
 msgid "Rejected Warehouse and Accepted Warehouse cannot be same."
 msgstr ""
 
@@ -41502,12 +41629,13 @@ msgstr ""
 
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:189
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:156
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1278
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1286
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:178
 msgid "Remaining Balance"
 msgstr ""
 
 #. Label of the remark (Small Text) field in DocType 'Journal Entry'
+#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651
 #: erpnext/accounts/doctype/journal_entry/journal_entry.json
 #: erpnext/selling/page/point_of_sale/pos_payment.js:489
 msgid "Remark"
@@ -41555,7 +41683,7 @@ msgstr ""
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:159
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:204
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:275
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1310
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1318
 #: erpnext/accounts/report/general_ledger/general_ledger.html:90
 #: erpnext/accounts/report/general_ledger/general_ledger.html:116
 #: erpnext/accounts/report/general_ledger/general_ledger.py:794
@@ -42026,7 +42154,7 @@ msgstr ""
 msgid "Request for Quotation Supplier"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1100
+#: erpnext/selling/doctype/sales_order/sales_order.js:1098
 msgid "Request for Raw Materials"
 msgstr ""
 
@@ -42231,7 +42359,7 @@ msgstr ""
 msgid "Reservation Based On"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:936
+#: erpnext/manufacturing/doctype/work_order/work_order.js:943
 #: erpnext/selling/doctype/sales_order/sales_order.js:107
 #: erpnext/stock/doctype/pick_list/pick_list.js:150
 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:180
@@ -42353,7 +42481,7 @@ 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:952
+#: erpnext/manufacturing/doctype/work_order/work_order.js:959
 #: 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
@@ -42380,7 +42508,7 @@ msgstr ""
 msgid "Reserved Stock for Sub-assembly"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:649
+#: erpnext/controllers/buying_controller.py:656
 msgid "Reserved Warehouse is mandatory for the Item {item_code} in Raw Materials supplied."
 msgstr ""
 
@@ -42630,7 +42758,7 @@ msgstr ""
 #: erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.js:43
 #: erpnext/buying/doctype/purchase_order/purchase_order.js:344
 #: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:63
-#: erpnext/selling/doctype/sales_order/sales_order.js:962
+#: erpnext/selling/doctype/sales_order/sales_order.js:960
 msgid "Resume"
 msgstr ""
 
@@ -42735,7 +42863,7 @@ msgstr ""
 msgid "Return Against Subcontracting Receipt"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:297
+#: erpnext/manufacturing/doctype/work_order/work_order.js:302
 msgid "Return Components"
 msgstr ""
 
@@ -42865,10 +42993,10 @@ msgstr ""
 msgid "Returns"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_payable/accounts_payable.js:140
-#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:102
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:172
-#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:130
+#: erpnext/accounts/report/accounts_payable/accounts_payable.js:151
+#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:113
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:183
+#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:141
 msgid "Revaluation Journals"
 msgstr ""
 
@@ -43037,11 +43165,8 @@ msgstr ""
 #. 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"
 msgstr ""
 
@@ -43056,6 +43181,12 @@ msgstr ""
 msgid "Role allowed to bypass period restrictions."
 msgstr ""
 
+#. Label of the role_to_override_stop_action (Link) field in DocType 'Selling
+#. Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "Role allowed to override stop action"
+msgstr ""
+
 #. Label of the role_to_notify_on_depreciation_failure (Link) field in DocType
 #. 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -43078,9 +43209,11 @@ msgid "Root Company"
 msgstr ""
 
 #. Label of the root_type (Select) field in DocType 'Account'
+#. Label of the root_type (Select) field in DocType 'Account Category'
 #. Label of the root_type (Select) field in DocType 'Ledger Merge'
 #: erpnext/accounts/doctype/account/account.json
 #: erpnext/accounts/doctype/account/account_tree.js:147
+#: erpnext/accounts/doctype/account_category/account_category.json
 #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json
 #: erpnext/accounts/report/account_balance/account_balance.js:22
 msgid "Root Type"
@@ -43296,7 +43429,7 @@ msgstr ""
 msgid "Row # {0}: Returned Item {1} does not exist in {2} {3}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:275
+#: erpnext/manufacturing/doctype/work_order/work_order.py:279
 msgid "Row #1: Sequence ID must be 1 for Operation {0}."
 msgstr ""
 
@@ -43323,15 +43456,15 @@ msgid "Row #{0}: Acceptance Criteria Formula is required."
 msgstr ""
 
 #: erpnext/controllers/subcontracting_controller.py:125
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:571
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:603
 msgid "Row #{0}: Accepted Warehouse and Rejected Warehouse cannot be same"
 msgstr ""
 
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:564
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:596
 msgid "Row #{0}: Accepted Warehouse is mandatory for the accepted Item {1}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1290
+#: erpnext/controllers/accounts_controller.py:1291
 msgid "Row #{0}: Account {1} does not belong to company {2}"
 msgstr ""
 
@@ -43396,27 +43529,27 @@ msgstr ""
 msgid "Row #{0}: Cannot create entry with different taxable AND withholding document links."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3777
+#: erpnext/controllers/accounts_controller.py:3783
 msgid "Row #{0}: Cannot delete item {1} which has already been billed."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3751
+#: erpnext/controllers/accounts_controller.py:3757
 msgid "Row #{0}: Cannot delete item {1} which has already been delivered"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3770
+#: erpnext/controllers/accounts_controller.py:3776
 msgid "Row #{0}: Cannot delete item {1} which has already been received"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3757
+#: erpnext/controllers/accounts_controller.py:3763
 msgid "Row #{0}: Cannot delete item {1} which has work order assigned to it."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3763
+#: erpnext/controllers/accounts_controller.py:3769
 msgid "Row #{0}: Cannot delete item {1} which is already ordered against this Sales Order."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4084
+#: erpnext/controllers/accounts_controller.py:4090
 msgid "Row #{0}: Cannot set Rate if the billed amount is greater than the amount for Item {1}."
 msgstr ""
 
@@ -43470,11 +43603,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:352
+#: erpnext/manufacturing/doctype/work_order/work_order.py:356
 msgid "Row #{0}: Customer Provided Item {1} cannot be added multiple times."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:377
+#: erpnext/manufacturing/doctype/work_order/work_order.py:381
 msgid "Row #{0}: Customer Provided Item {1} does not exist in the Required Items table linked to the Subcontracting Inward Order."
 msgstr ""
 
@@ -43482,7 +43615,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:365
+#: erpnext/manufacturing/doctype/work_order/work_order.py:369
 msgid "Row #{0}: Customer Provided Item {1} has insufficient quantity in the Subcontracting Inward Order. Available quantity is {2}."
 msgstr ""
 
@@ -43542,7 +43675,7 @@ msgstr ""
 msgid "Row #{0}: Finished Good must be {1}"
 msgstr ""
 
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:552
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:584
 msgid "Row #{0}: Finished Good reference is mandatory for Secondary Item {1}."
 msgstr ""
 
@@ -43551,11 +43684,11 @@ msgstr ""
 msgid "Row #{0}: For Customer Provided Item {1}, Source Warehouse must be {2}"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:697
 msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:706
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:707
 msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
 msgstr ""
 
@@ -43681,11 +43814,11 @@ msgstr ""
 msgid "Row #{0}: Please set reorder quantity"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:613
+#: erpnext/controllers/accounts_controller.py:614
 msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:345
+#: erpnext/manufacturing/doctype/bom/bom.py:346
 #, python-format
 msgid "Row #{0}: Process Loss Percentage should be less than 100% for {1} Item {2}"
 msgstr ""
@@ -43719,7 +43852,7 @@ msgstr ""
 msgid "Row #{0}: Quantity cannot be a non-positive number. Please increase the quantity or remove the Item {1}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1453
+#: erpnext/controllers/accounts_controller.py:1454
 msgid "Row #{0}: Quantity for Item {1} cannot be zero."
 msgstr ""
 
@@ -43727,7 +43860,7 @@ msgstr ""
 msgid "Row #{0}: Quantity of Item {1} cannot be more than {2} {3} against Subcontracting Inward Order {4}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:338
+#: erpnext/manufacturing/doctype/bom/bom.py:339
 msgid "Row #{0}: Quantity should be greater than 0 for {1} Item {2}"
 msgstr ""
 
@@ -43735,8 +43868,8 @@ msgstr ""
 msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:868
-#: erpnext/controllers/accounts_controller.py:880
+#: erpnext/controllers/accounts_controller.py:869
+#: erpnext/controllers/accounts_controller.py:881
 #: erpnext/utilities/transaction_base.py:114
 #: erpnext/utilities/transaction_base.py:120
 msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})"
@@ -43750,7 +43883,7 @@ 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:545
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:577
 msgid "Row #{0}: Rejected Qty cannot be set for Secondary Item {1}."
 msgstr ""
 
@@ -43774,7 +43907,7 @@ 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:540
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:572
 msgid "Row #{0}: Secondary Item Qty cannot be zero"
 msgstr ""
 
@@ -43786,7 +43919,7 @@ msgid ""
 "\t\t\t\t\tthis validation."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:281
+#: erpnext/manufacturing/doctype/work_order/work_order.py:285
 msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}."
 msgstr ""
 
@@ -43806,15 +43939,15 @@ msgstr ""
 msgid "Row #{0}: Serial No(s) {1} are not a part of the linked Subcontracting Inward Order. Please select valid Serial No(s)."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:641
+#: erpnext/controllers/accounts_controller.py:642
 msgid "Row #{0}: Service End Date cannot be before Invoice Posting Date"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:635
+#: erpnext/controllers/accounts_controller.py:636
 msgid "Row #{0}: Service Start Date cannot be greater than Service End Date"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:629
+#: erpnext/controllers/accounts_controller.py:630
 msgid "Row #{0}: Service Start and End Date is required for deferred accounting"
 msgstr ""
 
@@ -43830,11 +43963,11 @@ 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:386
+#: erpnext/manufacturing/doctype/work_order/work_order.py:390
 msgid "Row #{0}: Source Warehouse {1} for item {2} cannot be a customer warehouse."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:341
+#: erpnext/manufacturing/doctype/work_order/work_order.py:345
 msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order."
 msgstr ""
 
@@ -43854,7 +43987,7 @@ msgstr ""
 msgid "Row #{0}: Status is mandatory"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:458
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:459
 msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}"
 msgstr ""
 
@@ -43951,7 +44084,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:3891
+#: erpnext/controllers/accounts_controller.py:3897
 msgid "Row #{0}:Quantity for Item {1} cannot be zero."
 msgstr ""
 
@@ -43959,35 +44092,35 @@ msgstr ""
 msgid "Row #{1}: Warehouse is mandatory for stock Item {0}"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:311
+#: erpnext/controllers/buying_controller.py:315
 msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor."
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:580
+#: erpnext/controllers/buying_controller.py:587
 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer."
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:1064
+#: erpnext/controllers/buying_controller.py:1071
 msgid "Row #{idx}: Please enter a location for the asset item {item_code}."
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:703
+#: erpnext/controllers/buying_controller.py:710
 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}."
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:716
+#: erpnext/controllers/buying_controller.py:723
 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}."
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:669
+#: erpnext/controllers/buying_controller.py:676
 msgid "Row #{idx}: {field_label} is mandatory."
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:302
+#: erpnext/controllers/buying_controller.py:306
 msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same."
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:1181
+#: erpnext/controllers/buying_controller.py:1188
 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}."
 msgstr ""
 
@@ -44072,11 +44205,11 @@ msgstr ""
 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}"
 msgstr ""
 
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:273
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:276
 msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:611
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:612
 msgid "Row {0}: Account {1} and Party Type {2} have different account types"
 msgstr ""
 
@@ -44084,11 +44217,11 @@ msgstr ""
 msgid "Row {0}: Activity Type is mandatory."
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:677
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:678
 msgid "Row {0}: Advance against Customer must be credit"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:679
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:680
 msgid "Row {0}: Advance against Supplier must be debit"
 msgstr ""
 
@@ -44108,11 +44241,11 @@ msgstr ""
 msgid "Row {0}: Bill of Materials not found for the Item {1}"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:930
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:931
 msgid "Row {0}: Both Debit and Credit values cannot be zero"
 msgstr ""
 
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:587
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:619
 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."
@@ -44122,7 +44255,7 @@ msgstr ""
 msgid "Row {0}: Conversion Factor is mandatory"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3237
+#: erpnext/controllers/accounts_controller.py:3240
 msgid "Row {0}: Cost Center {1} does not belong to Company {2}"
 msgstr ""
 
@@ -44130,15 +44263,15 @@ msgstr ""
 msgid "Row {0}: Cost center is required for an item {1}"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:777
 msgid "Row {0}: Credit entry can not be linked with a {1}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:578
+#: erpnext/manufacturing/doctype/bom/bom.py:579
 msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:771
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:772
 msgid "Row {0}: Debit entry can not be linked with a {1}"
 msgstr ""
 
@@ -44150,7 +44283,7 @@ msgstr ""
 msgid "Row {0}: Delivery Warehouse cannot be same as Customer Warehouse for Item {1}."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2730
+#: erpnext/controllers/accounts_controller.py:2733
 msgid "Row {0}: Due Date in the Payment Terms table cannot be before Posting Date"
 msgstr ""
 
@@ -44158,8 +44291,8 @@ msgstr ""
 msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1021
-#: erpnext/controllers/taxes_and_totals.py:1381
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1022
+#: erpnext/controllers/taxes_and_totals.py:1395
 msgid "Row {0}: Exchange Rate is mandatory"
 msgstr ""
 
@@ -44212,11 +44345,11 @@ msgstr ""
 msgid "Row {0}: Hours value must be greater than zero."
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:796
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:797
 msgid "Row {0}: Invalid reference {1}"
 msgstr ""
 
-#: erpnext/controllers/taxes_and_totals.py:129
+#: erpnext/controllers/taxes_and_totals.py:134
 msgid "Row {0}: Item Tax template updated as per validity and rate applied"
 msgstr ""
 
@@ -44240,7 +44373,7 @@ msgstr ""
 msgid "Row {0}: Item {1}'s quantity cannot be higher than the available quantity."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1244
+#: erpnext/manufacturing/doctype/bom/bom.py:1245
 msgid "Row {0}: Operation time should be greater than 0 for operation {1}"
 msgstr ""
 
@@ -44252,11 +44385,11 @@ msgstr ""
 msgid "Row {0}: Packing Slip is already created for Item {1}."
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:822
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:823
 msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:600
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:601
 msgid "Row {0}: Party Type and Party is required for Receivable / Payable account {1}"
 msgstr ""
 
@@ -44264,11 +44397,11 @@ msgstr ""
 msgid "Row {0}: Payment Term is mandatory"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:670
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:671
 msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:663
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:664
 msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
 msgstr ""
 
@@ -44356,7 +44489,7 @@ msgstr ""
 msgid "Row {0}: The item {1}, quantity must be positive number"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3214
+#: erpnext/controllers/accounts_controller.py:3217
 msgid "Row {0}: The {3} Account {1} does not belong to the company {2}"
 msgstr ""
 
@@ -44364,7 +44497,7 @@ msgstr ""
 msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3593
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:3595
 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity."
 msgstr ""
 
@@ -44380,12 +44513,12 @@ msgstr ""
 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:1238
-#: erpnext/manufacturing/doctype/work_order/work_order.py:415
+#: erpnext/manufacturing/doctype/bom/bom.py:1239
+#: erpnext/manufacturing/doctype/work_order/work_order.py:419
 msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1172
+#: erpnext/controllers/accounts_controller.py:1173
 msgid "Row {0}: user has not applied the rule {1} on the item {2}"
 msgstr ""
 
@@ -44397,11 +44530,11 @@ msgstr ""
 msgid "Row {0}: {1} must be greater than 0"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:778
+#: erpnext/controllers/accounts_controller.py:779
 msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:836
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:837
 msgid "Row {0}: {1} {2} does not match with {3}"
 msgstr ""
 
@@ -44413,11 +44546,11 @@ msgstr ""
 msgid "Row {0}: {2} Item {1} does not exist in {2} {3}"
 msgstr ""
 
-#: erpnext/utilities/transaction_base.py:563
+#: erpnext/utilities/transaction_base.py:566
 msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}."
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:1046
+#: erpnext/controllers/buying_controller.py:1053
 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}."
 msgstr ""
 
@@ -44443,7 +44576,7 @@ msgstr ""
 msgid "Rows with Same Account heads will be merged on Ledger"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2741
+#: erpnext/controllers/accounts_controller.py:2744
 msgid "Rows with duplicate due dates in other rows were found: {0}"
 msgstr ""
 
@@ -44451,7 +44584,7 @@ msgstr ""
 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:280
+#: erpnext/controllers/accounts_controller.py:281
 msgid "Rows: {0} in {1} section are Invalid. Reference Name should point to a valid Payment Entry or Journal Entry."
 msgstr ""
 
@@ -44733,7 +44866,7 @@ msgstr ""
 #: erpnext/projects/doctype/timesheet/timesheet.json
 #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.json
 #: erpnext/selling/doctype/quotation/quotation_list.js:22
-#: erpnext/selling/doctype/sales_order/sales_order.js:1079
+#: erpnext/selling/doctype/sales_order/sales_order.js:1077
 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75
 #: erpnext/selling/workspace/selling/selling.json
 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json
@@ -44980,7 +45113,7 @@ msgstr ""
 #: erpnext/manufacturing/doctype/work_order/work_order.json
 #: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json
 #: erpnext/selling/doctype/sales_order/sales_order.js:344
-#: erpnext/selling/doctype/sales_order/sales_order.js:1295
+#: erpnext/selling/doctype/sales_order/sales_order.js:1293
 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json
 #: erpnext/stock/doctype/material_request_item/material_request_item.json
 #: erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -45040,12 +45173,12 @@ msgstr ""
 msgid "Sales Order {0} is not submitted"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:479
+#: erpnext/manufacturing/doctype/work_order/work_order.py:495
 msgid "Sales Order {0} is not valid"
 msgstr ""
 
 #: erpnext/controllers/selling_controller.py:476
-#: erpnext/manufacturing/doctype/work_order/work_order.py:484
+#: erpnext/manufacturing/doctype/work_order/work_order.py:500
 msgid "Sales Order {0} is {1}"
 msgstr ""
 
@@ -45100,18 +45233,18 @@ msgstr ""
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
 #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:119
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1299
-#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:103
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:130
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1307
+#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:114
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:194
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:74
 #: erpnext/selling/doctype/customer/customer.json
 #: erpnext/selling/doctype/sales_order/sales_order.json
 #: erpnext/selling/doctype/sms_center/sms_center.json
 #: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:16
-#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:60
-#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:8
-#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:71
+#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:166
+#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:16
+#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:45
 #: erpnext/selling/workspace/selling/selling.json
 #: erpnext/setup/doctype/sales_partner/sales_partner.json
 #: erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -45207,9 +45340,9 @@ msgstr ""
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:158
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:137
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:125
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1296
-#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:109
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:136
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1304
+#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:120
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:191
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:80
 #: erpnext/accounts/report/gross_profit/gross_profit.js:50
@@ -45403,12 +45536,6 @@ msgstr ""
 msgid "Sales Team"
 msgstr ""
 
-#. Label of the sales_update_frequency (Select) field in DocType 'Selling
-#. Settings'
-#: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Sales Update Frequency in Company and Project"
-msgstr ""
-
 #: erpnext/selling/report/sales_order_trends/sales_order_trends.py:56
 msgid "Sales Value"
 msgstr ""
@@ -45483,7 +45610,7 @@ msgstr ""
 msgid "Sample Size"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:4086
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088
 msgid "Sample quantity {0} cannot be more than received quantity {1}"
 msgstr ""
 
@@ -45537,7 +45664,7 @@ msgstr ""
 msgid "Scan Barcode"
 msgstr ""
 
-#: erpnext/public/js/utils/serial_no_batch_selector.js:160
+#: erpnext/public/js/utils/serial_no_batch_selector.js:171
 msgid "Scan Batch No"
 msgstr ""
 
@@ -45553,7 +45680,7 @@ msgstr ""
 msgid "Scan Mode"
 msgstr ""
 
-#: erpnext/public/js/utils/serial_no_batch_selector.js:145
+#: erpnext/public/js/utils/serial_no_batch_selector.js:156
 msgid "Scan Serial No"
 msgstr ""
 
@@ -45770,7 +45897,6 @@ msgid "Secondary Item Name"
 msgstr ""
 
 #. Label of the secondary_items (Table) field in DocType 'BOM'
-#. Label of the secondary_items_tab (Tab Break) field in DocType 'BOM'
 #. Label of the secondary_items (Table) field in DocType 'Job Card'
 #. Label of the secondary_items_section (Tab Break) field in DocType 'Job Card'
 #. Label of the secondary_items (Table) field in DocType 'Subcontracting Inward
@@ -45817,11 +45943,6 @@ msgstr ""
 msgid "Secretary"
 msgstr ""
 
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:112
-#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:90
-msgid "Section Code"
-msgstr ""
-
 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:177
 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:301
 msgid "Secured Loans"
@@ -45860,11 +45981,11 @@ msgstr ""
 msgid "Select Attribute Values"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1278
+#: erpnext/selling/doctype/sales_order/sales_order.js:1276
 msgid "Select BOM"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1255
+#: erpnext/selling/doctype/sales_order/sales_order.js:1253
 msgid "Select BOM and Qty for Production"
 msgstr ""
 
@@ -45886,7 +46007,7 @@ msgstr ""
 msgid "Select Brand..."
 msgstr ""
 
-#: erpnext/edi/doctype/code_list/code_list_import.js:109
+#: erpnext/edi/doctype/code_list/code_list_import.js:110
 msgid "Select Columns and Filters"
 msgstr ""
 
@@ -45939,7 +46060,7 @@ msgid "Select Employees"
 msgstr ""
 
 #: erpnext/buying/doctype/purchase_order/purchase_order.js:198
-#: erpnext/selling/doctype/sales_order/sales_order.js:826
+#: erpnext/selling/doctype/sales_order/sales_order.js:824
 msgid "Select Finished Good"
 msgstr ""
 
@@ -45949,13 +46070,13 @@ msgstr ""
 #. Forecast'
 #: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.json
 #: erpnext/manufacturing/doctype/sales_forecast/sales_forecast.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1621
-#: erpnext/selling/doctype/sales_order/sales_order.js:1649
+#: erpnext/selling/doctype/sales_order/sales_order.js:1619
+#: erpnext/selling/doctype/sales_order/sales_order.js:1647
 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:493
 msgid "Select Items"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1507
+#: erpnext/selling/doctype/sales_order/sales_order.js:1505
 msgid "Select Items based on Delivery Date"
 msgstr ""
 
@@ -45966,7 +46087,7 @@ msgstr ""
 #. Label of the select_items_to_manufacture_section (Section Break) field in
 #. DocType 'Production Plan'
 #: erpnext/manufacturing/doctype/production_plan/production_plan.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1307
+#: erpnext/selling/doctype/sales_order/sales_order.js:1305
 msgid "Select Items to Manufacture"
 msgstr ""
 
@@ -45997,7 +46118,7 @@ msgstr ""
 msgid "Select Possible Supplier"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1115
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1122
 #: erpnext/stock/doctype/pick_list/pick_list.js:216
 msgid "Select Quantity"
 msgstr ""
@@ -46110,7 +46231,7 @@ msgstr ""
 msgid "Select company name first."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2989
+#: erpnext/controllers/accounts_controller.py:2992
 msgid "Select finance book for the item {0} at row {1}"
 msgstr ""
 
@@ -46131,7 +46252,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:1217
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1224
 msgid "Select the Item to be manufactured."
 msgstr ""
 
@@ -46486,7 +46607,7 @@ msgstr ""
 #: 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:2944
-#: erpnext/public/js/utils/serial_no_batch_selector.js:421
+#: 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
 #: erpnext/stock/doctype/packed_item/packed_item.json
@@ -46542,7 +46663,7 @@ msgstr ""
 msgid "Serial No Ledger"
 msgstr ""
 
-#: erpnext/public/js/utils/serial_no_batch_selector.js:259
+#: erpnext/public/js/utils/serial_no_batch_selector.js:270
 msgid "Serial No Range"
 msgstr ""
 
@@ -46611,7 +46732,7 @@ msgstr ""
 msgid "Serial No is mandatory for Item {0}"
 msgstr ""
 
-#: erpnext/public/js/utils/serial_no_batch_selector.js:590
+#: erpnext/public/js/utils/serial_no_batch_selector.js:601
 msgid "Serial No {0} already exists"
 msgstr ""
 
@@ -46670,14 +46791,14 @@ msgstr ""
 
 #: erpnext/public/js/utils/barcode_scanner.js:292
 #: erpnext/public/js/utils/serial_no_batch_selector.js:16
-#: erpnext/public/js/utils/serial_no_batch_selector.js:190
+#: erpnext/public/js/utils/serial_no_batch_selector.js:201
 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:50
 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:170
 msgid "Serial Nos"
 msgstr ""
 
 #: erpnext/public/js/utils/serial_no_batch_selector.js:20
-#: erpnext/public/js/utils/serial_no_batch_selector.js:194
+#: erpnext/public/js/utils/serial_no_batch_selector.js:205
 msgid "Serial Nos / Batch Nos"
 msgstr ""
 
@@ -47208,12 +47329,6 @@ msgstr ""
 msgid "Set Grand Total to Default Payment Method"
 msgstr ""
 
-#. Label of the set_zero_rate_for_expired_batch (Check) field in DocType
-#. 'Selling Settings'
-#: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Set Incoming Rate as Zero for Expired Batch"
-msgstr ""
-
 #. Description of the 'Territory Targets' (Section Break) field in DocType
 #. 'Territory'
 #: erpnext/setup/doctype/territory/territory.json
@@ -47298,7 +47413,7 @@ msgstr ""
 msgid "Set Source Warehouse"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1627
+#: erpnext/selling/doctype/sales_order/sales_order.js:1625
 msgid "Set Supplier"
 msgstr ""
 
@@ -47378,6 +47493,12 @@ msgstr ""
 msgid "Set fieldname from which you want to fetch the data from the parent form."
 msgstr ""
 
+#. Label of the set_zero_rate_for_expired_batch (Check) field in DocType
+#. 'Selling Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "Set incoming rate as zero for expired Batch"
+msgstr ""
+
 #: erpnext/manufacturing/doctype/bom/bom.js:1021
 msgid "Set quantity of process loss item:"
 msgstr ""
@@ -47394,7 +47515,7 @@ msgstr ""
 msgid "Set targets Item Group-wise for this Sales Person."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1274
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1281
 msgid "Set the Planned Start Date (an Estimated Date at which you want the Production to begin)"
 msgstr ""
 
@@ -47489,8 +47610,8 @@ msgstr ""
 msgid "Setting up company"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1217
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1481
+#: erpnext/manufacturing/doctype/bom/bom.py:1218
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1497
 msgid "Setting {0} is required"
 msgstr ""
 
@@ -47740,11 +47861,11 @@ msgstr ""
 msgid "Shipping Address Template"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:572
+#: erpnext/controllers/accounts_controller.py:573
 msgid "Shipping Address does not belong to the {0}"
 msgstr ""
 
-#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:129
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:134
 msgid "Shipping Address does not have country, which is required for this Shipping Rule"
 msgstr ""
 
@@ -47837,15 +47958,15 @@ msgstr ""
 msgid "Shipping Zipcode"
 msgstr ""
 
-#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:133
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:138
 msgid "Shipping rule not applicable for country {0} in Shipping Address"
 msgstr ""
 
-#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:152
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:157
 msgid "Shipping rule only applicable for Buying"
 msgstr ""
 
-#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:147
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:152
 msgid "Shipping rule only applicable for Selling"
 msgstr ""
 
@@ -47945,14 +48066,14 @@ msgstr ""
 #. Label of the show_future_payments (Check) field in DocType 'Process
 #. Statement Of Accounts'
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/accounts_payable/accounts_payable.js:130
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:147
-#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:120
+#: erpnext/accounts/report/accounts_payable/accounts_payable.js:141
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:158
+#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:131
 msgid "Show Future Payments"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:107
-#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:125
+#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:118
+#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:136
 msgid "Show GL Balance"
 msgstr ""
 
@@ -47992,7 +48113,7 @@ msgstr ""
 msgid "Show Ledger View"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:152
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:163
 msgid "Show Linked Delivery Notes"
 msgstr ""
 
@@ -48038,8 +48159,8 @@ msgstr ""
 #. Label of the show_remarks (Check) field in DocType 'Process Statement Of
 #. Accounts'
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
-#: erpnext/accounts/report/accounts_payable/accounts_payable.js:125
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:162
+#: erpnext/accounts/report/accounts_payable/accounts_payable.js:136
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173
 #: erpnext/accounts/report/general_ledger/general_ledger.js:213
 msgid "Show Remarks"
 msgstr ""
@@ -48049,7 +48170,7 @@ msgstr ""
 msgid "Show Return Entries"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:157
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:168
 msgid "Show Sales Person"
 msgstr ""
 
@@ -48209,7 +48330,7 @@ msgstr ""
 msgid "Since there is a process loss of {0} units for the finished good {1}, you should reduce the quantity by {0} units for the finished good {1} in the Items Table."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:322
+#: erpnext/manufacturing/doctype/bom/bom.py:323
 msgid "Since you have enabled 'Track Semi Finished Goods', at least one operation must have 'Is Final Finished Good' checked. For that set the FG / Semi FG Item as {0} against an operation."
 msgstr ""
 
@@ -48243,7 +48364,7 @@ msgstr ""
 
 #. Label of the skip_material_transfer (Check) field in DocType 'Work Order
 #. Operation'
-#: erpnext/manufacturing/doctype/work_order/work_order.js:375
+#: erpnext/manufacturing/doctype/work_order/work_order.js:380
 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
 #: erpnext/manufacturing/doctype/workstation/workstation.js:454
 msgid "Skip Material Transfer"
@@ -48310,7 +48431,7 @@ msgstr ""
 msgid "Solvency Ratios"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4344
+#: erpnext/controllers/accounts_controller.py:4350
 msgid "Some required Company details are missing. You don't have permission to update them. Please contact your System Manager."
 msgstr ""
 
@@ -48374,7 +48495,7 @@ msgstr ""
 msgid "Source Location"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1025
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1032
 msgid "Source Manufacture Entry"
 msgstr ""
 
@@ -48445,7 +48566,7 @@ msgstr ""
 msgid "Source Warehouse is mandatory for the Item {0}."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:300
+#: erpnext/manufacturing/doctype/work_order/work_order.py:304
 msgid "Source Warehouse {0} must be same as Customer Warehouse {1} in the Subcontracting Inward Order."
 msgstr ""
 
@@ -48610,7 +48731,7 @@ msgstr ""
 
 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70
 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:485
-#: erpnext/tests/utils.py:316
+#: erpnext/tests/utils.py:275
 msgid "Standard Buying"
 msgstr ""
 
@@ -48624,8 +48745,8 @@ msgstr ""
 
 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70
 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493
-#: erpnext/stock/doctype/item/item.py:267 erpnext/tests/utils.py:324
-#: erpnext/tests/utils.py:2522
+#: erpnext/stock/doctype/item/item.py:267 erpnext/tests/utils.py:283
+#: erpnext/tests/utils.py:2504
 msgid "Standard Selling"
 msgstr ""
 
@@ -48989,7 +49110,7 @@ msgstr ""
 msgid "Stock Entry {0} has created"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1315
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1316
 msgid "Stock Entry {0} is not submitted"
 msgstr ""
 
@@ -49221,9 +49342,9 @@ msgstr ""
 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:289
 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:297
 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:303
-#: erpnext/manufacturing/doctype/work_order/work_order.js:938
-#: erpnext/manufacturing/doctype/work_order/work_order.js:947
+#: erpnext/manufacturing/doctype/work_order/work_order.js:945
 #: erpnext/manufacturing/doctype/work_order/work_order.js:954
+#: erpnext/manufacturing/doctype/work_order/work_order.js:961
 #: 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
@@ -49261,7 +49382,7 @@ msgstr ""
 
 #: erpnext/controllers/subcontracting_inward_controller.py:1018
 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2245
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2130
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2146
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1777
 msgid "Stock Reservation Entries Created"
 msgstr ""
@@ -49633,14 +49754,14 @@ msgstr ""
 msgid "Stop Reason"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1089
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1105
 msgid "Stopped Work Order cannot be cancelled, Unstop it first to cancel"
 msgstr ""
 
 #: erpnext/setup/doctype/company/company.py:384
 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33
 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537
-#: erpnext/stock/doctype/item/item.py:304 erpnext/tests/utils.py:289
+#: erpnext/stock/doctype/item/item.py:304 erpnext/tests/utils.py:248
 msgid "Stores"
 msgstr ""
 
@@ -49884,7 +50005,7 @@ msgstr ""
 #. Label of a Link in the Subcontracting Workspace
 #. Label of a Workspace Sidebar Item
 #: erpnext/manufacturing/doctype/work_order/work_order.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1013
+#: erpnext/selling/doctype/sales_order/sales_order.js:1011
 #: erpnext/stock/doctype/stock_entry/stock_entry.json
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.json
@@ -49921,12 +50042,6 @@ msgstr ""
 msgid "Subcontracting Inward Order Service Item"
 msgstr ""
 
-#. Label of the section_break_zwh6 (Section Break) field in DocType 'Selling
-#. Settings'
-#: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Subcontracting Inward Settings"
-msgstr ""
-
 #. Label of a Link in the Manufacturing Workspace
 #. Label of the subcontracting_order (Link) field in DocType 'Stock Entry'
 #. Option for the 'Voucher Type' (Select) field in DocType 'Stock Reservation
@@ -50066,7 +50181,7 @@ msgid "Subdivision"
 msgstr ""
 
 #: erpnext/buying/doctype/purchase_order/purchase_order.py:920
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1084
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1116
 msgid "Submit Action Failed"
 msgstr ""
 
@@ -50428,7 +50543,7 @@ msgstr ""
 #: erpnext/selling/doctype/customer/customer.js:253
 #: erpnext/selling/doctype/party_specific_item/party_specific_item.json
 #: erpnext/selling/doctype/sales_order/sales_order.js:197
-#: erpnext/selling/doctype/sales_order/sales_order.js:1685
+#: erpnext/selling/doctype/sales_order/sales_order.js:1683
 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json
 #: erpnext/selling/doctype/sms_center/sms_center.json
 #: erpnext/setup/workspace/home/home.json
@@ -50524,9 +50639,9 @@ msgstr ""
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/accounts/doctype/supplier_group_item/supplier_group_item.json
 #: erpnext/accounts/doctype/tax_rule/tax_rule.json
-#: erpnext/accounts/report/accounts_payable/accounts_payable.js:108
-#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:91
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1303
+#: erpnext/accounts/report/accounts_payable/accounts_payable.js:119
+#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:102
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1311
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:198
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:178
 #: erpnext/accounts/report/purchase_register/purchase_register.js:27
@@ -50572,7 +50687,7 @@ msgstr ""
 #. Label of the bill_date (Date) field in DocType 'Purchase Invoice'
 #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:145
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:232
 msgid "Supplier Invoice Date"
 msgstr ""
 
@@ -50583,7 +50698,7 @@ msgstr ""
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/accounts/report/general_ledger/general_ledger.html:110
 #: erpnext/accounts/report/general_ledger/general_ledger.py:789
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:139
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226
 msgid "Supplier Invoice No"
 msgstr ""
 
@@ -50630,7 +50745,7 @@ msgstr ""
 #. Label of the supplier_name (Data) field in DocType 'Purchase Receipt'
 #. Label of the supplier_name (Data) field in DocType 'Stock Entry'
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1220
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1227
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:156
 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:196
 #: erpnext/accounts/report/purchase_register/purchase_register.py:177
@@ -50755,7 +50870,7 @@ msgstr ""
 msgid "Supplier Reference"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1709
+#: erpnext/selling/doctype/sales_order/sales_order.js:1707
 msgid "Supplier Required"
 msgstr ""
 
@@ -50849,7 +50964,7 @@ msgstr ""
 msgid "Supplier delivers to Customer"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1708
+#: erpnext/selling/doctype/sales_order/sales_order.js:1706
 msgid "Supplier is required for all selected Items"
 msgstr ""
 
@@ -51000,7 +51115,7 @@ msgstr ""
 msgid "System will fetch all the entries if limit value is zero."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2223
+#: erpnext/controllers/accounts_controller.py:2226
 msgid "System will not check over billing since amount for Item {0} in {1} is zero"
 msgstr ""
 
@@ -51172,7 +51287,7 @@ msgstr ""
 msgid "Target Warehouse Address Link"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:245
+#: erpnext/manufacturing/doctype/work_order/work_order.py:249
 msgid "Target Warehouse Reservation Error"
 msgstr ""
 
@@ -51180,7 +51295,7 @@ 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:777
+#: erpnext/manufacturing/doctype/work_order/work_order.py:793
 msgid "Target Warehouse is required before Submit"
 msgstr ""
 
@@ -51188,7 +51303,7 @@ msgstr ""
 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:316
+#: erpnext/manufacturing/doctype/work_order/work_order.py:320
 msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcontracting Inward Order Item."
 msgstr ""
 
@@ -51286,8 +51401,8 @@ msgstr ""
 
 #. Label of the amount (Currency) field in DocType 'Item Wise Tax Detail'
 #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:163
-#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:115
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:244
+#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:91
 msgid "Tax Amount"
 msgstr ""
 
@@ -51392,7 +51507,7 @@ msgstr ""
 msgid "Tax Category"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:258
+#: erpnext/controllers/buying_controller.py:262
 msgid "Tax Category has been changed to \"Total\" because all the Items are non-stock items"
 msgstr ""
 
@@ -51426,8 +51541,8 @@ msgstr ""
 #: erpnext/accounts/report/purchase_register/purchase_register.py:192
 #: erpnext/accounts/report/sales_register/sales_register.py:215
 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:67
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:118
-#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:75
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:57
 #: erpnext/selling/doctype/sales_order/sales_order.json
 #: erpnext/stock/doctype/delivery_note/delivery_note.json
 msgid "Tax Id"
@@ -51465,8 +51580,8 @@ msgstr ""
 msgid "Tax Rate"
 msgstr ""
 
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:151
-#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:103
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:237
+#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:84
 msgid "Tax Rate %"
 msgstr ""
 
@@ -51555,6 +51670,8 @@ msgstr ""
 #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
 #: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
 #: erpnext/accounts/doctype/tax_withholding_entry/tax_withholding_entry.json
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:199
+#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:72
 #: erpnext/accounts/workspace/invoicing/invoicing.json
 #: erpnext/buying/doctype/supplier/supplier.json
 #: erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json
@@ -51664,8 +51781,8 @@ msgstr ""
 #. Label of the taxable_amount (Currency) field in DocType 'Item Wise Tax
 #. Detail'
 #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:157
-#: erpnext/controllers/taxes_and_totals.py:1252
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239
+#: erpnext/controllers/taxes_and_totals.py:1266
 msgid "Taxable Amount"
 msgstr ""
 
@@ -51875,7 +51992,7 @@ msgstr ""
 msgid "Template Item"
 msgstr ""
 
-#: erpnext/stock/get_item_details.py:340
+#: erpnext/stock/get_item_details.py:342
 msgid "Template Item Selected"
 msgstr ""
 
@@ -52097,9 +52214,9 @@ msgstr ""
 #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 #: erpnext/accounts/doctype/territory_item/territory_item.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:131
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1287
-#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:97
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:142
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1295
+#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:108
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:182
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:68
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:169
@@ -52128,9 +52245,9 @@ msgstr ""
 #: 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
-#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:45
+#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:160
 #: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:59
-#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:39
+#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:29
 #: erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.js:46
 #: erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py:61
 #: erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:59
@@ -52250,7 +52367,7 @@ msgstr ""
 msgid "The Pick List having Stock Reservation Entries cannot be updated. If you need to make changes, we recommend canceling the existing Stock Reservation Entries before updating the Pick List."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2820
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:2822
 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty"
 msgstr ""
 
@@ -52308,7 +52425,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:1222
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1229
 msgid "The default BOM for that item will be fetched by the system. You can also change the BOM."
 msgstr ""
 
@@ -52341,6 +52458,11 @@ msgstr ""
 msgid "The fields From Shareholder and To Shareholder cannot be blank"
 msgstr ""
 
+#. Description of the 'Item to Manufacture' (Link) field in DocType 'BOM'
+#: erpnext/manufacturing/doctype/bom/bom.json
+msgid "The final item that will be produced using this BOM."
+msgstr ""
+
 #: erpnext/accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.html:40
 msgid "The fiscal year has been automatically created in a Disabled state to maintain consistency with the previous fiscal year's status."
 msgstr ""
@@ -52365,7 +52487,7 @@ msgstr ""
 msgid "The following batches are expired, please restock them: <br> {0}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:423
+#: erpnext/controllers/accounts_controller.py:424
 msgid "The following cancelled repost entries exist for <b>{0}</b>:<br><br>{1}<br><br>Kindly delete these entries before continuing."
 msgstr ""
 
@@ -52395,6 +52517,12 @@ msgstr ""
 msgid "The following {0} were created: {1}"
 msgstr ""
 
+#. Description of the 'How often should sales data be updated in
+#. Company/Project?' (Select) field in DocType 'Selling Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "The frequency at which project progress and company transaction details will be updated. Set it to daily or monthly if you post a lot of transactions."
+msgstr ""
+
 #. Description of the 'Gross Weight' (Float) field in DocType 'Packing Slip'
 #: erpnext/stock/doctype/packing_slip/packing_slip.json
 msgid "The gross weight of the package. Usually net weight + packaging material weight. (for print)"
@@ -52404,7 +52532,7 @@ msgstr ""
 msgid "The holiday on {0} is not between From Date and To Date"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:1248
+#: erpnext/controllers/buying_controller.py:1255
 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master."
 msgstr ""
 
@@ -52412,7 +52540,7 @@ msgstr ""
 msgid "The items {0} and {1} are present in the following {2} :"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:1241
+#: erpnext/controllers/buying_controller.py:1248
 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters."
 msgstr ""
 
@@ -52458,7 +52586,7 @@ msgstr ""
 msgid "The original invoice should be consolidated before or along with the return invoice."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:202
+#: erpnext/controllers/accounts_controller.py:203
 msgid "The outstanding amount {0} in {1} is lesser than {2}. Updating the outstanding to this invoice."
 msgstr ""
 
@@ -52581,11 +52709,15 @@ msgstr ""
 msgid "The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3}"
 msgstr ""
 
+#: erpnext/edi/doctype/code_list/code_list_import.py:43
+msgid "The uploaded file could not be parsed as a genericode XML document."
+msgstr ""
+
 #: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:154
 msgid "The uploaded file does not appear to be in valid MT940 format."
 msgstr ""
 
-#: erpnext/edi/doctype/code_list/code_list_import.py:54
+#: erpnext/edi/doctype/code_list/code_list_import.py:40
 msgid "The uploaded file does not match the selected Code List."
 msgstr ""
 
@@ -52613,15 +52745,15 @@ msgstr ""
 msgid "The value {0} is already assigned to an existing Item {1}."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1250
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1257
 msgid "The warehouse where you store finished Items before they are shipped."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1243
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1250
 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:1255
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1262
 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 ""
 
@@ -52693,7 +52825,7 @@ msgstr ""
 msgid "There can only be 1 Account per Company in {0} {1}"
 msgstr ""
 
-#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:81
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:86
 msgid "There can only be one Shipping Rule Condition with 0 or blank value for \"To Value\""
 msgstr ""
 
@@ -52772,6 +52904,12 @@ msgstr ""
 msgid "This action will unlink this account from any external service integrating ERPNext with your bank accounts. It cannot be undone. Are you certain ?"
 msgstr ""
 
+#. Description of the 'Allow Sales Order creation for expired Quotation'
+#. (Check) field in DocType 'Selling Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "This allows creation of sales orders from quotations that have passed their expiration date, providing flexibility in processing orders despite outdated quotes."
+msgstr ""
+
 #: erpnext/assets/doctype/asset/asset.py:431
 msgid "This asset category is marked as non-depreciable. Please disable depreciation calculation or choose a different category."
 msgstr ""
@@ -52827,7 +52965,7 @@ msgstr ""
 msgid "This is a preview of the email to be sent. A PDF of the document will automatically be attached with the email."
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.js:35
+#: erpnext/accounts/doctype/account/account.js:45
 msgid "This is a root account and cannot be edited."
 msgstr ""
 
@@ -52875,7 +53013,7 @@ msgstr ""
 msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1236
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1243
 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 ""
 
@@ -53201,7 +53339,7 @@ msgstr ""
 msgid "To Currency"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:622
+#: erpnext/controllers/accounts_controller.py:623
 #: erpnext/setup/doctype/holiday_list/holiday_list.py:121
 msgid "To Date cannot be before From Date"
 msgstr ""
@@ -53475,7 +53613,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:3247
+#: erpnext/controllers/accounts_controller.py:3250
 msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included"
 msgstr ""
 
@@ -53508,7 +53646,7 @@ msgstr ""
 msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
 msgstr ""
 
-#: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:705
+#: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:709
 #: erpnext/accounts/report/financial_statements.py:621
 #: erpnext/accounts/report/general_ledger/general_ledger.py:310
 #: erpnext/accounts/report/trial_balance/trial_balance.py:310
@@ -53586,8 +53724,8 @@ msgstr ""
 msgid "Total (Company Currency)"
 msgstr ""
 
-#: erpnext/accounts/report/balance_sheet/balance_sheet.py:126
 #: erpnext/accounts/report/balance_sheet/balance_sheet.py:127
+#: erpnext/accounts/report/balance_sheet/balance_sheet.py:128
 msgid "Total (Credit)"
 msgstr ""
 
@@ -53679,7 +53817,7 @@ msgstr ""
 msgid "Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges"
 msgstr ""
 
-#: erpnext/accounts/report/balance_sheet/balance_sheet.py:216
+#: erpnext/accounts/report/balance_sheet/balance_sheet.py:217
 msgid "Total Asset"
 msgstr ""
 
@@ -53753,7 +53891,7 @@ msgstr ""
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 #: erpnext/selling/doctype/sales_order/sales_order.json
-#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:73
+#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:170
 #: erpnext/stock/doctype/delivery_note/delivery_note.json
 msgid "Total Commission"
 msgstr ""
@@ -53812,7 +53950,7 @@ msgstr ""
 msgid "Total Credit"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:342
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:343
 msgid "Total Credit/ Debit Amount should be same as linked Journal Entry"
 msgstr ""
 
@@ -53821,7 +53959,7 @@ msgstr ""
 msgid "Total Debit"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:936
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:937
 msgid "Total Debit must be equal to Total Credit. The difference is {0}"
 msgstr ""
 
@@ -53833,7 +53971,7 @@ msgstr ""
 msgid "Total Demand (Past Data)"
 msgstr ""
 
-#: erpnext/accounts/report/balance_sheet/balance_sheet.py:223
+#: erpnext/accounts/report/balance_sheet/balance_sheet.py:224
 msgid "Total Equity"
 msgstr ""
 
@@ -53842,11 +53980,11 @@ msgstr ""
 msgid "Total Estimated Distance"
 msgstr ""
 
-#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:122
+#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:123
 msgid "Total Expense"
 msgstr ""
 
-#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:118
+#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:119
 msgid "Total Expense This Year"
 msgstr ""
 
@@ -53884,11 +54022,11 @@ msgstr ""
 msgid "Total Holidays"
 msgstr ""
 
-#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:121
+#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:122
 msgid "Total Income"
 msgstr ""
 
-#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:117
+#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:118
 msgid "Total Income This Year"
 msgstr ""
 
@@ -53930,7 +54068,7 @@ msgstr ""
 msgid "Total Ledgers"
 msgstr ""
 
-#: erpnext/accounts/report/balance_sheet/balance_sheet.py:219
+#: erpnext/accounts/report/balance_sheet/balance_sheet.py:220
 msgid "Total Liability"
 msgstr ""
 
@@ -54035,7 +54173,7 @@ msgstr ""
 msgid "Total Paid Amount"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2795
+#: erpnext/controllers/accounts_controller.py:2798
 msgid "Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total"
 msgstr ""
 
@@ -54173,7 +54311,7 @@ msgstr ""
 msgid "Total Tax"
 msgstr ""
 
-#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:109
+#: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:86
 msgid "Total Taxable Amount"
 msgstr ""
 
@@ -54373,11 +54511,11 @@ msgstr ""
 msgid "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'"
 msgstr ""
 
-#: erpnext/controllers/trends.py:23 erpnext/controllers/trends.py:30
+#: erpnext/controllers/trends.py:25 erpnext/controllers/trends.py:32
 msgid "Total(Amt)"
 msgstr ""
 
-#: erpnext/controllers/trends.py:23 erpnext/controllers/trends.py:30
+#: erpnext/controllers/trends.py:25 erpnext/controllers/trends.py:32
 msgid "Total(Qty)"
 msgstr ""
 
@@ -54573,7 +54711,7 @@ msgstr ""
 #. Label of the transaction_type (Data) field in DocType 'Bank Transaction'
 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json
 #: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:187
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259
 msgid "Transaction Type"
 msgstr ""
 
@@ -55022,7 +55160,7 @@ msgstr ""
 #: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json
 #: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
 #: erpnext/selling/doctype/quotation_item/quotation_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1678
+#: erpnext/selling/doctype/sales_order/sales_order.js:1676
 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json
 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:43
 #: erpnext/selling/report/sales_analytics/sales_analytics.py:138
@@ -55112,7 +55250,7 @@ msgstr ""
 msgid "UOM Name"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:4008
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:4010
 msgid "UOM conversion factor required for UOM: {0} in Item: {1}"
 msgstr ""
 
@@ -55189,7 +55327,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:1047
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1063
 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 ""
 
@@ -55218,8 +55356,8 @@ msgstr ""
 msgid "Unblock Invoice"
 msgstr ""
 
-#: erpnext/accounts/report/balance_sheet/balance_sheet.py:83
 #: erpnext/accounts/report/balance_sheet/balance_sheet.py:84
+#: erpnext/accounts/report/balance_sheet/balance_sheet.py:85
 #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:90
 #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:91
 msgid "Unclosed Fiscal Years Profit / Loss (Credit)"
@@ -55275,7 +55413,12 @@ msgstr ""
 msgid "Unit"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4074
+#. Label of the uom (Link) field in DocType 'BOM'
+#: erpnext/manufacturing/doctype/bom/bom.json
+msgid "Unit Of Measure"
+msgstr ""
+
+#: erpnext/controllers/accounts_controller.py:4080
 msgid "Unit Price"
 msgstr ""
 
@@ -55426,7 +55569,7 @@ msgstr ""
 msgid "Unreconciled Entries"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:945
+#: erpnext/manufacturing/doctype/work_order/work_order.js:952
 #: erpnext/selling/doctype/sales_order/sales_order.js:122
 #: erpnext/stock/doctype/pick_list/pick_list.js:158
 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:193
@@ -55510,11 +55653,11 @@ msgstr ""
 msgid "Upcoming Calendar Events "
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.js:52
+#: erpnext/accounts/doctype/account/account.js:62
 msgid "Update Account Name / Number"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.js:158
+#: erpnext/accounts/doctype/account/account.js:176
 msgid "Update Account Number / Name"
 msgstr ""
 
@@ -55637,7 +55780,7 @@ msgstr ""
 #: erpnext/public/js/utils.js:946
 #: erpnext/selling/doctype/quotation/quotation.js:135
 #: erpnext/selling/doctype/sales_order/sales_order.js:90
-#: erpnext/selling/doctype/sales_order/sales_order.js:948
+#: erpnext/selling/doctype/sales_order/sales_order.js:946
 msgid "Update Items"
 msgstr ""
 
@@ -55647,7 +55790,7 @@ msgstr ""
 #. Invoice'
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/controllers/accounts_controller.py:195
+#: erpnext/controllers/accounts_controller.py:196
 msgid "Update Outstanding for Self"
 msgstr ""
 
@@ -55724,7 +55867,7 @@ msgstr ""
 msgid "Updated via 'Time Log' (In Minutes)"
 msgstr ""
 
-#: erpnext/accounts/doctype/account_category/account_category.py:54
+#: erpnext/accounts/doctype/account_category/account_category.py:55
 msgid "Updated {0} Financial Report Row(s) with new category name"
 msgstr ""
 
@@ -55736,7 +55879,7 @@ msgstr ""
 msgid "Updating Variants..."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1198
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1205
 msgid "Updating Work Order status"
 msgstr ""
 
@@ -55869,12 +56012,6 @@ msgstr ""
 msgid "Use Posting Datetime for Naming Documents"
 msgstr ""
 
-#. Label of the fallback_to_default_price_list (Check) field in DocType
-#. 'Selling Settings'
-#: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Use Prices from Default Price List as Fallback"
-msgstr ""
-
 #. Label of the use_serial_batch_fields (Check) field in DocType 'Stock
 #. Settings'
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
@@ -55937,6 +56074,12 @@ msgstr ""
 msgid "Use for Shopping Cart"
 msgstr ""
 
+#. Label of the fallback_to_default_price_list (Check) field in DocType
+#. 'Selling Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "Use prices from Default Price List as fallback"
+msgstr ""
+
 #. Label of the used (Int) field in DocType 'Coupon Code'
 #: erpnext/accounts/doctype/coupon_code/coupon_code.json
 msgid "Used"
@@ -55964,7 +56107,6 @@ msgstr ""
 #. Label of the user_remark (Small Text) field in DocType 'Journal Entry'
 #. Label of the user_remark (Small Text) field in DocType 'Journal Entry
 #. Account'
-#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651
 #: erpnext/accounts/doctype/journal_entry/journal_entry.json
 #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
 msgid "User Remark"
@@ -56185,17 +56327,17 @@ msgstr ""
 msgid "Validate Pricing Rule"
 msgstr ""
 
-#. Label of the validate_selling_price (Check) field in DocType 'Selling
-#. Settings'
-#: erpnext/selling/doctype/selling_settings/selling_settings.json
-msgid "Validate Selling Price for Item Against Purchase Rate or Valuation Rate"
-msgstr ""
-
 #. Label of the validate_stock_on_save (Check) field in DocType 'POS Profile'
 #: erpnext/accounts/doctype/pos_profile/pos_profile.json
 msgid "Validate Stock on Save"
 msgstr ""
 
+#. Label of the validate_selling_price (Check) field in DocType 'Selling
+#. Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "Validate selling price for Item against purchase or valuation rate"
+msgstr ""
+
 #. Label of the validity_details_section (Section Break) field in DocType
 #. 'Lower Deduction Certificate'
 #: erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json
@@ -56324,7 +56466,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:3271
+#: erpnext/controllers/accounts_controller.py:3274
 msgid "Valuation type charges can not be marked as Inclusive"
 msgstr ""
 
@@ -56826,7 +56968,7 @@ msgstr ""
 #: erpnext/accounts/doctype/repost_accounting_ledger_items/repost_accounting_ledger_items.json
 #: erpnext/accounts/doctype/repost_payment_ledger_items/repost_payment_ledger_items.json
 #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1242
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1250
 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56
 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221
 #: erpnext/accounts/report/general_ledger/general_ledger.js:49
@@ -56899,7 +57041,7 @@ msgstr ""
 #: erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json
 #: erpnext/accounts/doctype/repost_payment_ledger_items/repost_payment_ledger_items.json
 #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1240
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1248
 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212
 #: erpnext/accounts/report/general_ledger/general_ledger.py:736
 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
@@ -57132,7 +57274,7 @@ msgstr ""
 msgid "Warehouse {0} does not exist"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:242
+#: erpnext/manufacturing/doctype/work_order/work_order.py:246
 msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}"
 msgstr ""
 
@@ -57185,8 +57327,8 @@ msgstr ""
 #. Expense' (Select) field in DocType 'Budget'
 #. Option for the 'Action If Same Rate is Not Maintained' (Select) field in
 #. 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 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)
 #. field in DocType 'Stock Settings'
 #. Option for the 'Action If Quality Inspection Is Rejected' (Select) field in
@@ -57233,6 +57375,12 @@ msgstr ""
 msgid "Warn for new Request for Quotations"
 msgstr ""
 
+#. Description of the 'Maintain same rate throughout sales cycle' (Check) field
+#. in DocType 'Selling Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order."
+msgstr ""
+
 #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134
 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours"
 msgstr ""
@@ -57249,7 +57397,7 @@ msgstr ""
 msgid "Warning: Account changed for warehouse"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1321
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1322
 msgid "Warning: Another {0} # {1} exists against stock entry {2}"
 msgstr ""
 
@@ -57257,7 +57405,7 @@ msgstr ""
 msgid "Warning: Material Requested Qty is less than Minimum Order Qty"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1466
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1482
 msgid "Warning: Quantity exceeds maximum producible quantity based on quantity of raw materials received through the Subcontracting Inward Order {0}."
 msgstr ""
 
@@ -57351,7 +57499,7 @@ msgstr ""
 msgid "Wavelength In Megametres"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:190
+#: erpnext/controllers/accounts_controller.py:191
 msgid "We can see {0} is made against {1}. If you want {1}'s outstanding to be updated, uncheck the '{2}' checkbox."
 msgstr ""
 
@@ -57528,6 +57676,12 @@ msgstr ""
 msgid "When creating an Item, entering a value for this field will automatically create an Item Price at the backend."
 msgstr ""
 
+#. Description of the 'Enable cut-off date on creating bulk Delivery Notes'
+#. (Check) field in DocType 'Selling Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+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
 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 ""
@@ -57606,7 +57760,7 @@ msgstr ""
 msgid "Withholding Date"
 msgstr ""
 
-#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:206
+#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:278
 msgid "Withholding Document"
 msgstr ""
 
@@ -57680,7 +57834,7 @@ msgstr ""
 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:29
 #: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:104
 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1058
+#: erpnext/selling/doctype/sales_order/sales_order.js:1056
 #: erpnext/stock/doctype/material_request/material_request.js:216
 #: erpnext/stock/doctype/material_request/material_request.json
 #: erpnext/stock/doctype/material_request/material_request.py:871
@@ -57762,16 +57916,16 @@ msgstr ""
 msgid "Work Order cannot be created for following reason: <br> {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1410
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1426
 msgid "Work Order cannot be raised against a Item Template"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2486
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2566
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2502
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2582
 msgid "Work Order has been {0}"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1241
+#: erpnext/selling/doctype/sales_order/sales_order.js:1239
 msgid "Work Order not created"
 msgstr ""
 
@@ -57792,7 +57946,7 @@ msgstr ""
 msgid "Work Orders"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.js:1334
+#: erpnext/selling/doctype/sales_order/sales_order.js:1332
 msgid "Work Orders Created: {0}"
 msgstr ""
 
@@ -57813,7 +57967,7 @@ msgstr ""
 msgid "Work-in-Progress Warehouse"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:775
+#: erpnext/manufacturing/doctype/work_order/work_order.py:791
 msgid "Work-in-Progress Warehouse is required before Submit"
 msgstr ""
 
@@ -57861,7 +58015,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:339
+#: erpnext/manufacturing/doctype/work_order/work_order.js:344
 #: 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
@@ -58105,15 +58259,15 @@ msgstr ""
 msgid "Year start date or end date is overlapping with {0}. To avoid please set company"
 msgstr ""
 
-#: erpnext/edi/doctype/code_list/code_list_import.js:29
+#: erpnext/edi/doctype/code_list/code_list_import.js:30
 msgid "You are importing data for the code list:"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3871
+#: erpnext/controllers/accounts_controller.py:3877
 msgid "You are not allowed to update as per the conditions set in {} Workflow."
 msgstr ""
 
-#: erpnext/accounts/general_ledger.py:810
+#: erpnext/accounts/general_ledger.py:811
 msgid "You are not authorized to add or update entries before {0}"
 msgstr ""
 
@@ -58145,7 +58299,7 @@ msgstr ""
 msgid "You can change the parent account to a Balance Sheet account or select a different account."
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:712
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:713
 msgid "You can not enter current voucher in 'Against Journal Entry' column"
 msgstr ""
 
@@ -58170,7 +58324,7 @@ msgstr ""
 msgid "You can set it as a machine name or operation type. For example, stiching machine 12"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:211
+#: erpnext/controllers/accounts_controller.py:212
 msgid "You can use {0} to reconcile against {1} later."
 msgstr ""
 
@@ -58194,15 +58348,15 @@ msgstr ""
 msgid "You cannot create a {0} within the closed Accounting Period {1}"
 msgstr ""
 
-#: erpnext/accounts/general_ledger.py:182
+#: erpnext/accounts/general_ledger.py:183
 msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
 msgstr ""
 
-#: erpnext/accounts/general_ledger.py:830
+#: erpnext/accounts/general_ledger.py:831
 msgid "You cannot create/amend any accounting entries till this date."
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:945
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946
 msgid "You cannot credit and debit same account at the same time"
 msgstr ""
 
@@ -58250,7 +58404,7 @@ msgstr ""
 msgid "You do not have permission to edit this document"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3847
+#: erpnext/controllers/accounts_controller.py:3853
 msgid "You do not have permissions to {} items in a {}."
 msgstr ""
 
@@ -58262,15 +58416,15 @@ msgstr ""
 msgid "You don't have enough points to redeem."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4419
+#: erpnext/controllers/accounts_controller.py:4425
 msgid "You don't have permission to create a Company Address. Please contact your System Manager."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4399
+#: erpnext/controllers/accounts_controller.py:4405
 msgid "You don't have permission to update Company details. Please contact your System Manager."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4393
+#: erpnext/controllers/accounts_controller.py:4399
 msgid "You don't have permission to update this document. Please contact your System Manager."
 msgstr ""
 
@@ -58314,7 +58468,7 @@ msgstr ""
 msgid "You need to cancel POS Closing Entry {} to be able to cancel this document."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3222
+#: erpnext/controllers/accounts_controller.py:3225
 msgid "You selected the account group {1} as {2} Account in row {0}. Please select a single account."
 msgstr ""
 
@@ -58369,6 +58523,12 @@ msgstr ""
 msgid "Zero quantity"
 msgstr ""
 
+#. Label of the section_break_zero_qty (Section Break) field in DocType
+#. 'Selling Settings'
+#: erpnext/selling/doctype/selling_settings/selling_settings.json
+msgid "Zero-Quantity Line Items"
+msgstr ""
+
 #. Label of the zip_file (Attach) field in DocType 'Import Supplier Invoice'
 #: erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json
 msgid "Zip File"
@@ -58386,15 +58546,15 @@ msgstr ""
 msgid "after"
 msgstr ""
 
-#: erpnext/edi/doctype/code_list/code_list_import.js:57
+#: erpnext/edi/doctype/code_list/code_list_import.js:58
 msgid "as Code"
 msgstr ""
 
-#: erpnext/edi/doctype/code_list/code_list_import.js:73
+#: erpnext/edi/doctype/code_list/code_list_import.js:74
 msgid "as Description"
 msgstr ""
 
-#: erpnext/edi/doctype/code_list/code_list_import.js:48
+#: erpnext/edi/doctype/code_list/code_list_import.js:49
 msgid "as Title"
 msgstr ""
 
@@ -58414,7 +58574,7 @@ msgstr ""
 msgid "based_on"
 msgstr ""
 
-#: erpnext/edi/doctype/code_list/code_list_import.js:90
+#: erpnext/edi/doctype/code_list/code_list_import.js:91
 msgid "by {}"
 msgstr ""
 
@@ -58429,7 +58589,7 @@ msgstr ""
 
 #. Label of the description (Small Text) field in DocType 'Production Plan Sub
 #. Assembly Item'
-#: erpnext/edi/doctype/code_list/code_list_import.js:80
+#: erpnext/edi/doctype/code_list/code_list_import.js:81
 #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
 msgid "description"
 msgstr ""
@@ -58449,11 +58609,6 @@ msgstr ""
 msgid "doc_type"
 msgstr ""
 
-#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:25
-#: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:25
-msgid "doctype"
-msgstr ""
-
 #. Description of the 'Coupon Name' (Data) field in DocType 'Coupon Code'
 #: erpnext/accounts/doctype/coupon_code/coupon_code.json
 msgid "e.g. \"Summer Holiday 2019 Offer 20\""
@@ -58685,7 +58840,7 @@ msgstr ""
 msgid "you must select Capital Work in Progress Account in accounts table"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1282
+#: erpnext/controllers/accounts_controller.py:1283
 msgid "{0} '{1}' is disabled"
 msgstr ""
 
@@ -58693,7 +58848,7 @@ msgstr ""
 msgid "{0} '{1}' not in Fiscal Year {2}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:661
+#: erpnext/manufacturing/doctype/work_order/work_order.py:677
 msgid "{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3}"
 msgstr ""
 
@@ -58701,7 +58856,7 @@ msgstr ""
 msgid "{0} <b>{1}</b> has submitted Assets. Remove Item <b>{2}</b> from table to continue."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2377
+#: erpnext/controllers/accounts_controller.py:2380
 msgid "{0} Account not found against Customer {1}."
 msgstr ""
 
@@ -58729,11 +58884,11 @@ msgstr ""
 msgid "{0} Number {1} is already used in {2} {3}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1679
+#: erpnext/manufacturing/doctype/bom/bom.py:1680
 msgid "{0} Operating Cost for operation {1}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:573
+#: erpnext/manufacturing/doctype/work_order/work_order.js:578
 msgid "{0} Operations: {1}"
 msgstr ""
 
@@ -58761,19 +58916,19 @@ msgstr ""
 msgid "{0} account not found while submitting purchase receipt"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1065
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1066
 msgid "{0} against Bill {1} dated {2}"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1074
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1075
 msgid "{0} against Purchase Order {1}"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1041
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1042
 msgid "{0} against Sales Invoice {1}"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1048
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1049
 msgid "{0} against Sales Order {1}"
 msgstr ""
 
@@ -58790,7 +58945,7 @@ msgstr ""
 msgid "{0} asset cannot be transferred"
 msgstr ""
 
-#: erpnext/controllers/trends.py:60
+#: erpnext/controllers/trends.py:66
 msgid "{0} can be either {1} or {2}."
 msgstr ""
 
@@ -58837,11 +58992,11 @@ msgstr ""
 msgid "{0} does not belong to Company {1}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:349
+#: erpnext/controllers/accounts_controller.py:350
 msgid "{0} does not belong to the Company {1}."
 msgstr ""
 
-#: erpnext/accounts/doctype/item_tax_template/item_tax_template.py:67
+#: erpnext/accounts/doctype/item_tax_template/item_tax_template.py:74
 msgid "{0} entered twice in Item Tax"
 msgstr ""
 
@@ -58871,7 +59026,7 @@ msgstr ""
 msgid "{0} hours"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2735
+#: erpnext/controllers/accounts_controller.py:2738
 msgid "{0} in row {1}"
 msgstr ""
 
@@ -58893,7 +59048,7 @@ msgstr ""
 msgid "{0} is already running for {1}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:172
+#: erpnext/controllers/accounts_controller.py:173
 msgid "{0} is blocked so this transaction cannot proceed"
 msgstr ""
 
@@ -58906,15 +59061,15 @@ msgid "{0} is mandatory for Item {1}"
 msgstr ""
 
 #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:100
-#: erpnext/accounts/general_ledger.py:854
+#: erpnext/accounts/general_ledger.py:855
 msgid "{0} is mandatory for account {1}"
 msgstr ""
 
-#: erpnext/public/js/controllers/taxes_and_totals.js:129
+#: erpnext/public/js/controllers/taxes_and_totals.js:131
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3179
+#: erpnext/controllers/accounts_controller.py:3182
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}."
 msgstr ""
 
@@ -58966,27 +59121,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:538
+#: erpnext/manufacturing/doctype/work_order/work_order.js:543
 msgid "{0} items disassembled"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:502
+#: erpnext/manufacturing/doctype/work_order/work_order.js:507
 msgid "{0} items in progress"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:526
+#: erpnext/manufacturing/doctype/work_order/work_order.js:531
 msgid "{0} items lost during process."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:483
+#: erpnext/manufacturing/doctype/work_order/work_order.js:488
 msgid "{0} items produced"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:506
+#: erpnext/manufacturing/doctype/work_order/work_order.js:511
 msgid "{0} items returned"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:509
+#: erpnext/manufacturing/doctype/work_order/work_order.js:514
 msgid "{0} items to return"
 msgstr ""
 
@@ -58998,7 +59153,7 @@ msgstr ""
 msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:611
+#: erpnext/manufacturing/doctype/bom/bom.py:612
 msgid "{0} not found for item {1}"
 msgstr ""
 
@@ -59055,7 +59210,7 @@ msgstr ""
 msgid "{0} variants created."
 msgstr ""
 
-#: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:238
+#: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:242
 msgid "{0} view is currently unsupported in Custom Financial Report."
 msgstr ""
 
@@ -59071,7 +59226,7 @@ msgstr ""
 msgid "{0} {1}"
 msgstr ""
 
-#: erpnext/public/js/utils/serial_no_batch_selector.js:254
+#: erpnext/public/js/utils/serial_no_batch_selector.js:265
 msgid "{0} {1} Manually"
 msgstr ""
 
@@ -59119,7 +59274,7 @@ msgstr ""
 msgid "{0} {1} is allocated twice in this Bank Transaction"
 msgstr ""
 
-#: erpnext/edi/doctype/common_code/common_code.py:52
+#: erpnext/edi/doctype/common_code/common_code.py:54
 msgid "{0} {1} is already linked to Common Code {2}."
 msgstr ""
 
@@ -59140,7 +59295,7 @@ msgstr ""
 msgid "{0} {1} is cancelled so the action cannot be completed"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:860
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:861
 msgid "{0} {1} is closed"
 msgstr ""
 
@@ -59152,7 +59307,7 @@ msgstr ""
 msgid "{0} {1} is frozen"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:857
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:858
 msgid "{0} {1} is fully billed"
 msgstr ""
 
@@ -59168,8 +59323,8 @@ msgstr ""
 msgid "{0} {1} is not in any active Fiscal Year"
 msgstr ""
 
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:854
-#: erpnext/accounts/doctype/journal_entry/journal_entry.py:893
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:855
+#: erpnext/accounts/doctype/journal_entry/journal_entry.py:894
 msgid "{0} {1} is not submitted"
 msgstr ""
 
@@ -59189,7 +59344,7 @@ msgstr ""
 msgid "{0} {1} status is {2}"
 msgstr ""
 
-#: erpnext/public/js/utils/serial_no_batch_selector.js:230
+#: erpnext/public/js/utils/serial_no_batch_selector.js:241
 msgid "{0} {1} via CSV File"
 msgstr ""
 
@@ -59286,11 +59441,11 @@ msgstr ""
 msgid "{0}: Virtual DocType (no database table)"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:539
+#: erpnext/controllers/accounts_controller.py:540
 msgid "{0}: {1} does not belong to the Company: {2}"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1392
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1400
 msgid "{0}: {1} does not exist"
 msgstr ""
 
@@ -59306,15 +59461,15 @@ msgstr ""
 msgid "{0}: {1} must be less than {2}"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:1023
+#: erpnext/controllers/buying_controller.py:1030
 msgid "{count} Assets created for {item_code}"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:921
+#: erpnext/controllers/buying_controller.py:928
 msgid "{doctype} {name} is cancelled or closed."
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:632
+#: erpnext/controllers/buying_controller.py:639
 msgid "{field_label} is mandatory for sub-contracted {doctype}."
 msgstr ""
 
@@ -59322,7 +59477,7 @@ msgstr ""
 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:729
+#: erpnext/controllers/buying_controller.py:736
 msgid "{ref_doctype} {ref_name} is {status}."
 msgstr ""
 
@@ -59334,7 +59489,7 @@ msgstr ""
 msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
 msgstr ""
 
-#: erpnext/controllers/buying_controller.py:286
+#: erpnext/controllers/buying_controller.py:290
 msgid "{} has submitted assets linked to it. You need to cancel the assets to create purchase return."
 msgstr ""