diff --git a/erpnext/accounts/doctype/bank_account/bank_account.py b/erpnext/accounts/doctype/bank_account/bank_account.py
index bfc8b33..8da4566 100644
--- a/erpnext/accounts/doctype/bank_account/bank_account.py
+++ b/erpnext/accounts/doctype/bank_account/bank_account.py
@@ -115,6 +115,10 @@
 	return frappe.db.get_value(party_type, party, "default_bank_account")
 
 
+def get_default_company_bank_account(company):
+	return frappe.db.get_value("Bank Account", {"company": company, "is_company_account": 1, "is_default": 1})
+
+
 @frappe.whitelist()
 def get_bank_account_details(bank_account):
 	return frappe.get_cached_value(
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index 781d9f5..0ac0156 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -470,6 +470,9 @@
 							() => frm.events.set_dynamic_labels(frm),
 							() => {
 								frm.set_party_account_based_on_party = false;
+								if (r.message.party_bank_account) {
+									frm.set_value("party_bank_account", r.message.party_bank_account);
+								}
 								if (r.message.bank_account) {
 									frm.set_value("bank_account", r.message.bank_account);
 								}
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index e2041bf..90ff5b1 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -16,6 +16,7 @@
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_dimensions
 from erpnext.accounts.doctype.bank_account.bank_account import (
 	get_bank_account_details,
+	get_default_company_bank_account,
 	get_party_bank_account,
 )
 from erpnext.accounts.doctype.invoice_discounting.invoice_discounting import (
@@ -194,6 +195,9 @@
 		if self.docstatus > 0 or self.payment_type == "Internal Transfer":
 			return
 
+		if self.party_type not in ("Customer", "Supplier"):
+			return
+
 		if not frappe.db.get_value(
 			"Company", self.company, "book_advance_payments_in_separate_party_account"
 		):
@@ -2109,7 +2113,9 @@
 	party_name = frappe.db.get_value(party_type, party, _party_name)
 	party_balance = get_balance_on(party_type=party_type, party=party, cost_center=cost_center)
 	if party_type in ["Customer", "Supplier"]:
-		bank_account = get_party_bank_account(party_type, party)
+		party_bank_account = get_party_bank_account(party_type, party)
+
+	bank_account = get_default_company_bank_account(company)
 
 	return {
 		"party_account": party_account,
@@ -2117,6 +2123,7 @@
 		"party_account_currency": account_currency,
 		"party_balance": party_balance,
 		"account_balance": account_balance,
+		"party_bank_account": party_bank_account,
 		"bank_account": bank_account,
 	}
 
diff --git a/erpnext/accounts/doctype/payment_order/payment_order.js b/erpnext/accounts/doctype/payment_order/payment_order.js
index f009de5..4033fc0 100644
--- a/erpnext/accounts/doctype/payment_order/payment_order.js
+++ b/erpnext/accounts/doctype/payment_order/payment_order.js
@@ -71,6 +71,7 @@
 			target: frm,
 			date_field: "posting_date",
 			setters: {
+				party_type: "Supplier",
 				party: frm.doc.supplier || "",
 			},
 			get_query_filters: {
@@ -91,6 +92,7 @@
 			source_doctype: "Payment Request",
 			target: frm,
 			setters: {
+				party_type: "Supplier",
 				party: frm.doc.supplier || "",
 			},
 			get_query_filters: {
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index c7862c1..0af00c4 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -665,7 +665,7 @@
 			else:
 				future_amount_field = "future_amount_in_base_currency"
 
-			if row.remaining_balance > 0 and future.get(future_amount_field):
+			if row.remaining_balance != 0 and future.get(future_amount_field):
 				if future.get(future_amount_field) > row.outstanding:
 					row.future_amount = row.outstanding
 					future[future_amount_field] = future.get(future_amount_field) - row.outstanding
diff --git a/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py
index 83d95de..a65e424 100644
--- a/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py
@@ -463,11 +463,30 @@
 		)
 
 	def test_future_payments(self):
+		sr = self.create_sales_invoice(do_not_submit=True)
+		sr.is_return = 1
+		sr.items[0].qty = -1
+		sr.items[0].rate = 10
+		sr.calculate_taxes_and_totals()
+		sr.submit()
+
 		si = self.create_sales_invoice()
 		pe = get_payment_entry(si.doctype, si.name)
+		pe.append(
+			"references",
+			{
+				"reference_doctype": sr.doctype,
+				"reference_name": sr.name,
+				"due_date": sr.due_date,
+				"total_amount": sr.grand_total,
+				"outstanding_amount": sr.outstanding_amount,
+				"allocated_amount": sr.outstanding_amount,
+			},
+		)
+
 		pe.posting_date = add_days(today(), 1)
-		pe.paid_amount = 90.0
-		pe.references[0].allocated_amount = 90.0
+		pe.paid_amount = 80
+		pe.references[0].allocated_amount = 90.0  # pe.paid_amount + sr.grand_total
 		pe.save().submit()
 		filters = {
 			"company": self.company,
@@ -479,16 +498,21 @@
 			"show_future_payments": True,
 		}
 		report = execute(filters)[1]
-		self.assertEqual(len(report), 1)
+		self.assertEqual(len(report), 2)
 
-		expected_data = [100.0, 100.0, 10.0, 90.0]
+		expected_data = {sr.name: [10.0, -10.0, 0.0, -10], si.name: [100.0, 100.0, 10.0, 90.0]}
 
-		row = report[0]
-		self.assertEqual(
-			expected_data, [row.invoiced, row.outstanding, row.remaining_balance, row.future_amount]
-		)
+		rows = report[:2]
+		for row in rows:
+			self.assertEqual(
+				expected_data[row.voucher_no],
+				[row.invoiced or row.paid, row.outstanding, row.remaining_balance, row.future_amount],
+			)
 
 		pe.cancel()
+		sr.load_from_db()  # Outstanding amount is updated so a updated timestamp is needed.
+		sr.cancel()
+
 		# full payment in future date
 		pe = get_payment_entry(si.doctype, si.name)
 		pe.posting_date = add_days(today(), 1)
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index bee46c1..888e040 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -453,7 +453,7 @@
 
 	for gle in gl_entries:
 		group_by_value = gle.get(group_by)
-		gle.voucher_type = _(gle.voucher_type)
+		gle.voucher_type = gle.voucher_type
 		gle.voucher_subtype = _(gle.voucher_subtype)
 		gle.against_voucher_type = _(gle.against_voucher_type)
 		gle.remarks = _(gle.remarks)
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py
index dd4546d..374ecf3 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -661,7 +661,7 @@
 					dn["item_row"],
 					dn["warehouse"],
 				)
-				my_sle = self.get_stock_ledger_entries(item_code, row.warehouse)
+				my_sle = self.get_stock_ledger_entries(item_code, _warehouse)
 				return self.calculate_buying_amount_from_sle(
 					row, my_sle, parenttype, parent, item_row, item_code
 				)
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index 89e47b4..60ba0d1 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -139,7 +139,7 @@
 			self.in_words = money_in_words(amount, self.currency)
 
 	def calculate_commission(self):
-		if not self.meta.get_field("commission_rate") or self.docstatus.is_submitted():
+		if not self.meta.get_field("commission_rate"):
 			return
 
 		self.round_floats_in(self, ("amount_eligible_for_commission", "commission_rate"))
@@ -748,12 +748,12 @@
 			"item_code": child.item_code,
 			"warehouse": child.warehouse,
 			"voucher_type": parent.doctype,
-			"voucher_no": parent.name,
+			"voucher_no": parent.name if parent.docstatus < 2 else None,
 			"voucher_detail_no": child.name,
 			"posting_date": parent.posting_date,
 			"posting_time": parent.posting_time,
 			"qty": child.qty,
-			"type_of_transaction": "Outward" if child.qty > 0 else "Inward",
+			"type_of_transaction": "Outward" if child.qty > 0 and parent.docstatus < 2 else "Inward",
 			"company": parent.company,
 			"do_not_submit": "True",
 		}
diff --git a/erpnext/locale/main.pot b/erpnext/locale/main.pot
index 61208a6..b862fd0 100644
--- a/erpnext/locale/main.pot
+++ b/erpnext/locale/main.pot
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: ERPNext VERSION\n"
 "Report-Msgid-Bugs-To: info@erpnext.com\n"
-"POT-Creation-Date: 2024-03-24 09:35+0000\n"
-"PO-Revision-Date: 2024-03-24 09:35+0000\n"
+"POT-Creation-Date: 2024-03-31 09:35+0000\n"
+"PO-Revision-Date: 2024-03-31 09:35+0000\n"
 "Last-Translator: info@erpnext.com\n"
 "Language-Team: info@erpnext.com\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@
 msgid " Address"
 msgstr ""
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:618
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:614
 msgid " Amount"
 msgstr ""
 
@@ -36,29 +36,29 @@
 msgid " Is Child Table"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:184
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:182
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:107
 #: selling/report/sales_analytics/sales_analytics.py:66
 msgid " Name"
 msgstr ""
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:609
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:605
 msgid " Rate"
 msgstr ""
 
-#: projects/doctype/project_update/project_update.py:110
+#: projects/doctype/project_update/project_update.py:104
 msgid " Summary"
 msgstr ""
 
-#: stock/doctype/item/item.py:235
+#: stock/doctype/item/item.py:234
 msgid "\"Customer Provided Item\" cannot be Purchase Item also"
 msgstr ""
 
-#: stock/doctype/item/item.py:237
+#: stock/doctype/item/item.py:236
 msgid "\"Customer Provided Item\" cannot have Valuation Rate"
 msgstr ""
 
-#: stock/doctype/item/item.py:313
+#: stock/doctype/item/item.py:312
 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item"
 msgstr ""
 
@@ -627,8 +627,8 @@
 msgid "% Occupied"
 msgstr ""
 
-#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:280
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:332
+#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:284
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:337
 msgid "% Of Grand Total"
 msgstr ""
 
@@ -713,11 +713,11 @@
 msgid "% of materials delivered against this Sales Order"
 msgstr ""
 
-#: controllers/accounts_controller.py:1991
+#: controllers/accounts_controller.py:1975
 msgid "'Account' in the Accounting section of Customer {0}"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:266
+#: selling/doctype/sales_order/sales_order.py:269
 msgid "'Allow Multiple Sales Orders Against a Customer's Purchase Order'"
 msgstr ""
 
@@ -733,17 +733,17 @@
 msgid "'Days Since Last Order' must be greater than or equal to zero"
 msgstr ""
 
-#: controllers/accounts_controller.py:1996
+#: controllers/accounts_controller.py:1980
 msgid "'Default {0} Account' in Company {1}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:1075
+#: accounts/doctype/journal_entry/journal_entry.py:1083
 msgid "'Entries' cannot be empty"
 msgstr ""
 
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.py:24
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:99
-#: stock/report/stock_analytics/stock_analytics.py:321
+#: stock/report/stock_analytics/stock_analytics.py:314
 msgid "'From Date' is required"
 msgstr ""
 
@@ -751,7 +751,7 @@
 msgid "'From Date' must be after 'To Date'"
 msgstr ""
 
-#: stock/doctype/item/item.py:392
+#: stock/doctype/item/item.py:391
 msgid "'Has Serial No' can not be 'Yes' for non-stock item"
 msgstr ""
 
@@ -759,33 +759,33 @@
 msgid "'Opening'"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:388
+#: stock/doctype/delivery_note/delivery_note.py:398
 msgid "'Sales Invoice Item' reference ({1}) is missing in row {0}"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:381
+#: stock/doctype/delivery_note/delivery_note.py:391
 msgid "'Sales Invoice' reference ({1}) is missing in row {0}"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:364
+#: stock/doctype/delivery_note/delivery_note.py:374
 msgid "'Sales Order Item' reference ({1}) is missing in row {0}"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:357
+#: stock/doctype/delivery_note/delivery_note.py:367
 msgid "'Sales Order' reference ({1}) is missing in row {0}"
 msgstr ""
 
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.py:27
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:101
-#: stock/report/stock_analytics/stock_analytics.py:326
+#: stock/report/stock_analytics/stock_analytics.py:319
 msgid "'To Date' is required"
 msgstr ""
 
-#: stock/doctype/packing_slip/packing_slip.py:96
+#: stock/doctype/packing_slip/packing_slip.py:94
 msgid "'To Package No.' cannot be less than 'From Package No.'"
 msgstr ""
 
-#: controllers/sales_and_purchase_return.py:67
+#: controllers/sales_and_purchase_return.py:65
 msgid "'Update Stock' can not be checked because items are not delivered via {0}"
 msgstr ""
 
@@ -797,11 +797,11 @@
 msgid "'{0}' account is already used by {1}. Use another account."
 msgstr ""
 
-#: controllers/accounts_controller.py:392
+#: controllers/accounts_controller.py:395
 msgid "'{0}' account: '{1}' should match the Return Against Invoice"
 msgstr ""
 
-#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:175
+#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:174
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:180
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:104
 msgid "(A) Qty After Transaction"
@@ -817,17 +817,17 @@
 msgid "(C) Total Qty in Queue"
 msgstr ""
 
-#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:185
+#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:184
 msgid "(C) Total qty in queue"
 msgstr ""
 
-#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:195
+#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:194
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:210
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:134
 msgid "(D) Balance Stock Value"
 msgstr ""
 
-#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:200
+#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:199
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:215
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:139
 msgid "(E) Balance Stock Value in Queue"
@@ -838,7 +838,7 @@
 msgid "(F) Change in Stock Value"
 msgstr ""
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py:193
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py:192
 msgid "(Forecast)"
 msgstr ""
 
@@ -852,7 +852,7 @@
 msgid "(H) Change in Stock Value (FIFO Queue)"
 msgstr ""
 
-#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:210
+#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:209
 msgid "(H) Valuation Rate"
 msgstr ""
 
@@ -971,8 +971,8 @@
 msgid "11-50"
 msgstr ""
 
-#: regional/report/uae_vat_201/uae_vat_201.py:99
-#: regional/report/uae_vat_201/uae_vat_201.py:105
+#: regional/report/uae_vat_201/uae_vat_201.py:95
+#: regional/report/uae_vat_201/uae_vat_201.py:101
 msgid "1{0}"
 msgstr ""
 
@@ -1077,7 +1077,7 @@
 msgid "90 Above"
 msgstr ""
 
-#: crm/doctype/appointment_booking_settings/appointment_booking_settings.py:60
+#: crm/doctype/appointment_booking_settings/appointment_booking_settings.py:61
 msgid "<b>From Time</b> cannot be later than <b>To Time</b> for {0}"
 msgstr ""
 
@@ -1353,17 +1353,17 @@
 msgid "A - B"
 msgstr ""
 
-#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:190
+#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:189
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:205
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:129
 msgid "A - C"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:209
+#: manufacturing/doctype/bom/bom.py:206
 msgid "A BOM with name {0} already exists for item {1}."
 msgstr ""
 
-#: selling/doctype/customer/customer.py:309
+#: selling/doctype/customer/customer.py:308
 msgid "A Customer Group exists with same name please change the Customer name or rename the Customer Group"
 msgstr ""
 
@@ -1371,7 +1371,7 @@
 msgid "A Holiday List can be added to exclude counting these days for the Workstation."
 msgstr ""
 
-#: crm/doctype/lead/lead.py:142
+#: crm/doctype/lead/lead.py:140
 msgid "A Lead requires either a person's name or an organization's name"
 msgstr ""
 
@@ -1389,7 +1389,7 @@
 msgid "A Product or a Service that is bought, sold or kept in stock."
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:535
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:532
 msgid "A Reconciliation Job {0} is running for the same filters. Cannot reconcile now"
 msgstr ""
 
@@ -1401,7 +1401,7 @@
 "Sales Order at the heart of your sales and purchase transactions. Sales Orders are linked in Delivery Note, Sales Invoices, Material Request, and Maintenance transactions. Through Sales Order, you can track fulfillment of the overall deal towards the customer."
 msgstr ""
 
-#: setup/doctype/company/company.py:916
+#: setup/doctype/company/company.py:898
 msgid "A Transaction Deletion Document: {0} is triggered for {0}"
 msgstr ""
 
@@ -1434,7 +1434,7 @@
 msgid "A new appointment has been created for you with {0}"
 msgstr ""
 
-#: accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py:98
+#: accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py:96
 msgid "A template with tax category {0} already exists. Only one template is allowed with each tax category"
 msgstr ""
 
@@ -1629,6 +1629,11 @@
 msgid "AWB Number"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Abampere"
+msgstr ""
+
 #. Label of a Data field in DocType 'Company'
 #: setup/doctype/company/company.json
 msgctxt "Company"
@@ -1641,15 +1646,15 @@
 msgid "Abbreviation"
 msgstr ""
 
-#: setup/doctype/company/company.py:163
+#: setup/doctype/company/company.py:160
 msgid "Abbreviation already used for another company"
 msgstr ""
 
-#: setup/doctype/company/company.py:158
+#: setup/doctype/company/company.py:157
 msgid "Abbreviation is mandatory"
 msgstr ""
 
-#: stock/doctype/item_attribute/item_attribute.py:100
+#: stock/doctype/item_attribute/item_attribute.py:102
 msgid "Abbreviation: {0} must appear only once"
 msgstr ""
 
@@ -1671,7 +1676,7 @@
 msgid "About {0} seconds remaining"
 msgstr ""
 
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:224
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:222
 msgid "Above"
 msgstr ""
 
@@ -1735,7 +1740,7 @@
 msgid "Accepted Qty in Stock UOM"
 msgstr ""
 
-#: public/js/controllers/transaction.js:2167
+#: public/js/controllers/transaction.js:2168
 msgid "Accepted Quantity"
 msgstr ""
 
@@ -1787,7 +1792,7 @@
 msgid "Access Key"
 msgstr ""
 
-#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:49
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:48
 msgid "Access Key is required for Service Provider: {0}"
 msgstr ""
 
@@ -1797,22 +1802,28 @@
 msgid "Access Token"
 msgstr ""
 
+#. Description of the 'Common Code' (Data) field in DocType 'UOM'
+#: setup/doctype/uom/uom.json
+msgctxt "UOM"
+msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010"
+msgstr ""
+
 #. Name of a DocType
 #: accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.js:16
 #: accounts/doctype/account/account.json
 #: accounts/doctype/pos_closing_entry/closing_voucher_details.html:65
 #: accounts/report/account_balance/account_balance.py:21
 #: accounts/report/budget_variance_report/budget_variance_report.py:83
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:291
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py:205
-#: accounts/report/financial_statements.py:621
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:285
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py:201
+#: accounts/report/financial_statements.py:620
 #: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:30
-#: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:193
+#: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:190
 #: accounts/report/general_ledger/general_ledger.js:38
-#: accounts/report/general_ledger/general_ledger.py:578
+#: accounts/report/general_ledger/general_ledger.py:569
 #: accounts/report/payment_ledger/payment_ledger.js:30
 #: accounts/report/payment_ledger/payment_ledger.py:145
-#: accounts/report/trial_balance/trial_balance.py:415
+#: accounts/report/trial_balance/trial_balance.py:409
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
 #: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:15
 #: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:15
@@ -2111,8 +2122,8 @@
 msgid "Account Manager"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:884
-#: controllers/accounts_controller.py:2000
+#: accounts/doctype/sales_invoice/sales_invoice.py:876
+#: controllers/accounts_controller.py:1984
 msgid "Account Missing"
 msgstr ""
 
@@ -2140,7 +2151,7 @@
 msgid "Account Name"
 msgstr ""
 
-#: accounts/doctype/account/account.py:325
+#: accounts/doctype/account/account.py:321
 msgid "Account Not Found"
 msgstr ""
 
@@ -2154,7 +2165,7 @@
 msgid "Account Number"
 msgstr ""
 
-#: accounts/doctype/account/account.py:477
+#: accounts/doctype/account/account.py:472
 msgid "Account Number {0} already used in account {1}"
 msgstr ""
 
@@ -2233,15 +2244,15 @@
 msgid "Account Type"
 msgstr ""
 
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:126
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:124
 msgid "Account Value"
 msgstr ""
 
-#: accounts/doctype/account/account.py:298
+#: accounts/doctype/account/account.py:294
 msgid "Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'"
 msgstr ""
 
-#: accounts/doctype/account/account.py:292
+#: accounts/doctype/account/account.py:288
 msgid "Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'"
 msgstr ""
 
@@ -2271,28 +2282,28 @@
 msgid "Account is not set for the dashboard chart {0}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:679
+#: assets/doctype/asset/asset.py:675
 msgid "Account not Found"
 msgstr ""
 
-#: accounts/doctype/account/account.py:379
+#: accounts/doctype/account/account.py:375
 msgid "Account with child nodes cannot be converted to ledger"
 msgstr ""
 
-#: accounts/doctype/account/account.py:271
+#: accounts/doctype/account/account.py:267
 msgid "Account with child nodes cannot be set as ledger"
 msgstr ""
 
-#: accounts/doctype/account/account.py:390
+#: accounts/doctype/account/account.py:386
 msgid "Account with existing transaction can not be converted to group."
 msgstr ""
 
-#: accounts/doctype/account/account.py:419
+#: accounts/doctype/account/account.py:415
 msgid "Account with existing transaction can not be deleted"
 msgstr ""
 
-#: accounts/doctype/account/account.py:266
-#: accounts/doctype/account/account.py:381
+#: accounts/doctype/account/account.py:262
+#: accounts/doctype/account/account.py:377
 msgid "Account with existing transaction cannot be converted to ledger"
 msgstr ""
 
@@ -2300,15 +2311,15 @@
 msgid "Account {0} added multiple times"
 msgstr ""
 
-#: setup/doctype/company/company.py:186
+#: setup/doctype/company/company.py:183
 msgid "Account {0} does not belong to company: {1}"
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:99
+#: accounts/doctype/budget/budget.py:101
 msgid "Account {0} does not belongs to company {1}"
 msgstr ""
 
-#: accounts/doctype/account/account.py:551
+#: accounts/doctype/account/account.py:546
 msgid "Account {0} does not exist"
 msgstr ""
 
@@ -2324,59 +2335,59 @@
 msgid "Account {0} does not match with Company {1} in Mode of Account: {2}"
 msgstr ""
 
-#: accounts/doctype/account/account.py:509
+#: accounts/doctype/account/account.py:504
 msgid "Account {0} exists in parent company {1}."
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:108
+#: accounts/doctype/budget/budget.py:111
 msgid "Account {0} has been entered multiple times"
 msgstr ""
 
-#: accounts/doctype/account/account.py:363
+#: accounts/doctype/account/account.py:359
 msgid "Account {0} is added in the child company {1}"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:397
+#: accounts/doctype/gl_entry/gl_entry.py:396
 msgid "Account {0} is frozen"
 msgstr ""
 
-#: controllers/accounts_controller.py:1096
+#: controllers/accounts_controller.py:1108
 msgid "Account {0} is invalid. Account Currency must be {1}"
 msgstr ""
 
-#: accounts/doctype/account/account.py:151
+#: accounts/doctype/account/account.py:149
 msgid "Account {0}: Parent account {1} can not be a ledger"
 msgstr ""
 
-#: accounts/doctype/account/account.py:157
+#: accounts/doctype/account/account.py:155
 msgid "Account {0}: Parent account {1} does not belong to company: {2}"
 msgstr ""
 
-#: accounts/doctype/account/account.py:145
+#: accounts/doctype/account/account.py:143
 msgid "Account {0}: Parent account {1} does not exist"
 msgstr ""
 
-#: accounts/doctype/account/account.py:148
+#: accounts/doctype/account/account.py:146
 msgid "Account {0}: You can not assign itself as parent account"
 msgstr ""
 
-#: accounts/general_ledger.py:412
+#: accounts/general_ledger.py:406
 msgid "Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:259
+#: accounts/doctype/journal_entry/journal_entry.py:256
 msgid "Account: {0} can only be updated via Stock Transactions"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:338
+#: accounts/report/general_ledger/general_ledger.py:330
 msgid "Account: {0} does not exist"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:2117
+#: accounts/doctype/payment_entry/payment_entry.py:2134
 msgid "Account: {0} is not permitted under Payment Entry"
 msgstr ""
 
-#: controllers/accounts_controller.py:2676
+#: controllers/accounts_controller.py:2651
 msgid "Account: {0} with currency: {1} can not be selected"
 msgstr ""
 
@@ -2536,12 +2547,12 @@
 msgid "Accounting Dimension"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:196
+#: accounts/doctype/gl_entry/gl_entry.py:201
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:153
 msgid "Accounting Dimension <b>{0}</b> is required for 'Balance Sheet' account {1}."
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:183
+#: accounts/doctype/gl_entry/gl_entry.py:188
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:140
 msgid "Accounting Dimension <b>{0}</b> is required for 'Profit and Loss' account {1}."
 msgstr ""
@@ -2866,37 +2877,37 @@
 msgid "Accounting Entries are reposted."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:713 assets/doctype/asset/asset.py:728
-#: assets/doctype/asset_capitalization/asset_capitalization.py:578
+#: assets/doctype/asset/asset.py:708 assets/doctype/asset/asset.py:723
+#: assets/doctype/asset_capitalization/asset_capitalization.py:573
 msgid "Accounting Entry for Asset"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:737
+#: stock/doctype/purchase_receipt/purchase_receipt.py:732
 msgid "Accounting Entry for Service"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:934
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:954
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:970
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:987
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1006
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1027
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1127
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1318
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1336
-#: controllers/stock_controller.py:350 controllers/stock_controller.py:365
-#: stock/doctype/purchase_receipt/purchase_receipt.py:841
-#: stock/doctype/stock_entry/stock_entry.py:1473
-#: stock/doctype/stock_entry/stock_entry.py:1487
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:520
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:939
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:959
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:975
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:992
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1011
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1034
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1133
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1323
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1341
+#: controllers/stock_controller.py:363 controllers/stock_controller.py:380
+#: stock/doctype/purchase_receipt/purchase_receipt.py:836
+#: stock/doctype/stock_entry/stock_entry.py:1488
+#: stock/doctype/stock_entry/stock_entry.py:1502
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:528
 msgid "Accounting Entry for Stock"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:659
+#: stock/doctype/purchase_receipt/purchase_receipt.py:652
 msgid "Accounting Entry for {0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:2042
+#: controllers/accounts_controller.py:2025
 msgid "Accounting Entry for {0}: {1} can only be made in currency: {2}"
 msgstr ""
 
@@ -2947,7 +2958,7 @@
 msgid "Accounting entries for this invoice needs to be reposted. Please click on 'Repost' button to update."
 msgstr ""
 
-#: setup/doctype/company/company.py:316
+#: setup/doctype/company/company.py:308
 msgid "Accounts"
 msgstr ""
 
@@ -3122,7 +3133,7 @@
 msgid "Accounts Manager"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:341
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:339
 msgid "Accounts Missing Error"
 msgstr ""
 
@@ -3322,7 +3333,7 @@
 msgid "Accounts User"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:1180
+#: accounts/doctype/journal_entry/journal_entry.py:1182
 msgid "Accounts table cannot be blank."
 msgstr ""
 
@@ -3372,12 +3383,12 @@
 msgid "Accumulated Depreciation Amount"
 msgstr ""
 
-#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:405
-#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:423
+#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:397
+#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:415
 msgid "Accumulated Depreciation as on"
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:250
+#: accounts/doctype/budget/budget.py:245
 msgid "Accumulated Monthly"
 msgstr ""
 
@@ -3401,6 +3412,16 @@
 msgid "Acquisition Date"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Acre"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Acre (US)"
+msgstr ""
+
 #: crm/doctype/lead/lead.js:42
 #: public/js/bank_reconciliation_tool/dialog_manager.js:175
 msgid "Action"
@@ -3741,7 +3762,7 @@
 msgid "Actual End Time"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.py:387
+#: accounts/report/budget_variance_report/budget_variance_report.py:380
 msgid "Actual Expense"
 msgstr ""
 
@@ -3763,7 +3784,7 @@
 msgid "Actual Operation Time"
 msgstr ""
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:399
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:397
 msgid "Actual Posting"
 msgstr ""
 
@@ -4033,6 +4054,18 @@
 msgid "Add Sales Partners"
 msgstr ""
 
+#. Label of a Button field in DocType 'Subcontracting Receipt Item'
+#: subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+msgctxt "Subcontracting Receipt Item"
+msgid "Add Serial / Batch Bundle"
+msgstr ""
+
+#. Label of a Button field in DocType 'Subcontracting Receipt Supplied Item'
+#: subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
+msgctxt "Subcontracting Receipt Supplied Item"
+msgid "Add Serial / Batch Bundle"
+msgstr ""
+
 #. Label of a Button field in DocType 'Purchase Invoice Item'
 #: accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
 msgctxt "Purchase Invoice Item"
@@ -4063,6 +4096,12 @@
 msgid "Add Serial / Batch No (Rejected Qty)"
 msgstr ""
 
+#. Label of a Button field in DocType 'Subcontracting Receipt Item'
+#: subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+msgctxt "Subcontracting Receipt Item"
+msgid "Add Serial / Batch No (Rejected Qty)"
+msgstr ""
+
 #: public/js/utils.js:71
 msgid "Add Serial No"
 msgstr ""
@@ -4087,7 +4126,7 @@
 msgid "Add Template"
 msgstr ""
 
-#: utilities/activation.py:125
+#: utilities/activation.py:123
 msgid "Add Timesheets"
 msgstr ""
 
@@ -4116,7 +4155,7 @@
 msgstr ""
 
 #: stock/doctype/pick_list/pick_list.js:71
-#: stock/doctype/pick_list/pick_list.py:654
+#: stock/doctype/pick_list/pick_list.py:651
 msgid "Add items in the Item Locations table"
 msgstr ""
 
@@ -4126,7 +4165,7 @@
 msgid "Add or Deduct"
 msgstr ""
 
-#: utilities/activation.py:115
+#: utilities/activation.py:113
 msgid "Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts"
 msgstr ""
 
@@ -4172,7 +4211,7 @@
 msgid "Added On"
 msgstr ""
 
-#: buying/doctype/supplier/supplier.py:130
+#: buying/doctype/supplier/supplier.py:128
 msgid "Added Supplier Role to User {0}."
 msgstr ""
 
@@ -4180,7 +4219,7 @@
 msgid "Added {0} ({1})"
 msgstr ""
 
-#: controllers/website_list_for_contact.py:307
+#: controllers/website_list_for_contact.py:304
 msgid "Added {1} Role to User {0}."
 msgstr ""
 
@@ -4576,7 +4615,7 @@
 msgid "Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Dunning'
+#. Label of a Text Editor field in DocType 'Dunning'
 #: accounts/doctype/dunning/dunning.json
 msgctxt "Dunning"
 msgid "Address"
@@ -4594,31 +4633,31 @@
 msgid "Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Installation Note'
+#. Label of a Text Editor field in DocType 'Installation Note'
 #: selling/doctype/installation_note/installation_note.json
 msgctxt "Installation Note"
 msgid "Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Maintenance Schedule'
+#. Label of a Text Editor field in DocType 'Maintenance Schedule'
 #: maintenance/doctype/maintenance_schedule/maintenance_schedule.json
 msgctxt "Maintenance Schedule"
 msgid "Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Maintenance Visit'
+#. Label of a Text Editor field in DocType 'Maintenance Visit'
 #: maintenance/doctype/maintenance_visit/maintenance_visit.json
 msgctxt "Maintenance Visit"
 msgid "Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Opportunity'
+#. Label of a Text Editor field in DocType 'Opportunity'
 #: crm/doctype/opportunity/opportunity.json
 msgctxt "Opportunity"
 msgid "Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'POS Invoice'
+#. Label of a Text Editor field in DocType 'POS Invoice'
 #: accounts/doctype/pos_invoice/pos_invoice.json
 msgctxt "POS Invoice"
 msgid "Address"
@@ -4630,31 +4669,31 @@
 msgid "Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Purchase Invoice'
+#. Label of a Text Editor field in DocType 'Purchase Invoice'
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
 msgid "Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Purchase Receipt'
+#. Label of a Text Editor field in DocType 'Purchase Receipt'
 #: stock/doctype/purchase_receipt/purchase_receipt.json
 msgctxt "Purchase Receipt"
 msgid "Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Quotation'
+#. Label of a Text Editor field in DocType 'Quotation'
 #: selling/doctype/quotation/quotation.json
 msgctxt "Quotation"
 msgid "Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Sales Invoice'
+#. Label of a Text Editor field in DocType 'Sales Invoice'
 #: accounts/doctype/sales_invoice/sales_invoice.json
 msgctxt "Sales Invoice"
 msgid "Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Sales Order'
+#. Label of a Text Editor field in DocType 'Sales Order'
 #: selling/doctype/sales_order/sales_order.json
 msgctxt "Sales Order"
 msgid "Address"
@@ -4666,25 +4705,25 @@
 msgid "Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Stock Entry'
+#. Label of a Text Editor field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
 msgid "Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Subcontracting Receipt'
+#. Label of a Text Editor field in DocType 'Subcontracting Receipt'
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 msgctxt "Subcontracting Receipt"
 msgid "Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Supplier Quotation'
+#. Label of a Text Editor field in DocType 'Supplier Quotation'
 #: buying/doctype/supplier_quotation/supplier_quotation.json
 msgctxt "Supplier Quotation"
 msgid "Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Warranty Claim'
+#. Label of a Text Editor field in DocType 'Warranty Claim'
 #: support/doctype/warranty_claim/warranty_claim.json
 msgctxt "Warranty Claim"
 msgid "Address"
@@ -4939,7 +4978,7 @@
 msgid "Address and Contacts"
 msgstr ""
 
-#: accounts/custom/address.py:33
+#: accounts/custom/address.py:31
 msgid "Address needs to be linked to a Company. Please add a row for Company in the Links table."
 msgstr ""
 
@@ -4964,7 +5003,7 @@
 msgid "Adjustment Against"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:582
+#: stock/doctype/purchase_receipt/purchase_receipt.py:575
 msgid "Adjustment based on Purchase Invoice rate"
 msgstr ""
 
@@ -4981,7 +5020,7 @@
 #: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json
 #: accounts/doctype/pos_opening_entry/pos_opening_entry.json
 #: accounts/doctype/repost_accounting_ledger_settings/repost_accounting_ledger_settings.json
-#: stock/reorder_item.py:388
+#: stock/reorder_item.py:387
 msgid "Administrator"
 msgstr ""
 
@@ -4991,7 +5030,7 @@
 msgid "Advance Account"
 msgstr ""
 
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:167
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
 msgid "Advance Amount"
 msgstr ""
 
@@ -5030,7 +5069,7 @@
 msgid "Advance Payment Status"
 msgstr ""
 
-#: controllers/accounts_controller.py:224
+#: controllers/accounts_controller.py:223
 msgid "Advance Payments"
 msgstr ""
 
@@ -5086,11 +5125,11 @@
 msgid "Advance amount"
 msgstr ""
 
-#: controllers/taxes_and_totals.py:744
+#: controllers/taxes_and_totals.py:749
 msgid "Advance amount cannot be greater than {0} {1}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:768
+#: accounts/doctype/journal_entry/journal_entry.py:775
 msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
 msgstr ""
 
@@ -5149,8 +5188,8 @@
 msgstr ""
 
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.py:39
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:94
-#: accounts/report/general_ledger/general_ledger.py:644
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:91
+#: accounts/report/general_ledger/general_ledger.py:635
 msgid "Against Account"
 msgstr ""
 
@@ -5184,7 +5223,7 @@
 msgid "Against Blanket Order"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:962
+#: accounts/doctype/sales_invoice/sales_invoice.py:965
 msgid "Against Customer Order {0} dated {1}"
 msgstr ""
 
@@ -5246,12 +5285,12 @@
 msgid "Against Income Account"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:636
-#: accounts/doctype/payment_entry/payment_entry.py:678
+#: accounts/doctype/journal_entry/journal_entry.py:637
+#: accounts/doctype/payment_entry/payment_entry.py:690
 msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:364
+#: accounts/doctype/gl_entry/gl_entry.py:361
 msgid "Against Journal Entry {0} is already adjusted against some other voucher"
 msgstr ""
 
@@ -5285,11 +5324,11 @@
 msgid "Against Stock Entry"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:333
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:332
 msgid "Against Supplier Invoice {0} dated {1}"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:663
+#: accounts/report/general_ledger/general_ledger.py:654
 msgid "Against Voucher"
 msgstr ""
 
@@ -5311,7 +5350,7 @@
 msgid "Against Voucher No"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:661
+#: accounts/report/general_ledger/general_ledger.py:652
 #: accounts/report/payment_ledger/payment_ledger.py:176
 msgid "Against Voucher Type"
 msgstr ""
@@ -5337,11 +5376,11 @@
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:151
 #: accounts/report/accounts_receivable/accounts_receivable.html:133
-#: accounts/report/accounts_receivable/accounts_receivable.py:1142
+#: accounts/report/accounts_receivable/accounts_receivable.py:1132
 msgid "Age (Days)"
 msgstr ""
 
-#: stock/report/stock_ageing/stock_ageing.py:205
+#: stock/report/stock_ageing/stock_ageing.py:204
 msgid "Age ({0})"
 msgstr ""
 
@@ -5486,8 +5525,8 @@
 
 #: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165
 #: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166
-#: accounts/utils.py:1293 public/js/setup_wizard.js:174
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:164
+#: accounts/utils.py:1266 public/js/setup_wizard.js:174
 msgid "All Accounts"
 msgstr ""
 
@@ -5527,7 +5566,7 @@
 msgid "All Activities HTML"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:268
+#: manufacturing/doctype/bom/bom.py:265
 msgid "All BOMs"
 msgstr ""
 
@@ -5560,15 +5599,15 @@
 #: patches/v11_0/create_department_records_for_each_company.py:23
 #: patches/v11_0/update_department_lft_rgt.py:9
 #: patches/v11_0/update_department_lft_rgt.py:11
-#: patches/v11_0/update_department_lft_rgt.py:17
-#: setup/doctype/company/company.py:309 setup/doctype/company/company.py:312
-#: setup/doctype/company/company.py:317 setup/doctype/company/company.py:323
-#: setup/doctype/company/company.py:329 setup/doctype/company/company.py:335
-#: setup/doctype/company/company.py:341 setup/doctype/company/company.py:347
-#: setup/doctype/company/company.py:353 setup/doctype/company/company.py:359
-#: setup/doctype/company/company.py:365 setup/doctype/company/company.py:371
-#: setup/doctype/company/company.py:377 setup/doctype/company/company.py:383
-#: setup/doctype/company/company.py:389
+#: patches/v11_0/update_department_lft_rgt.py:16
+#: setup/doctype/company/company.py:301 setup/doctype/company/company.py:304
+#: setup/doctype/company/company.py:309 setup/doctype/company/company.py:315
+#: setup/doctype/company/company.py:321 setup/doctype/company/company.py:327
+#: setup/doctype/company/company.py:333 setup/doctype/company/company.py:339
+#: setup/doctype/company/company.py:345 setup/doctype/company/company.py:351
+#: setup/doctype/company/company.py:357 setup/doctype/company/company.py:363
+#: setup/doctype/company/company.py:369 setup/doctype/company/company.py:375
+#: setup/doctype/company/company.py:381
 msgid "All Departments"
 msgstr ""
 
@@ -5622,9 +5661,9 @@
 msgid "All Supplier Contact"
 msgstr ""
 
-#: patches/v11_0/rename_supplier_type_to_supplier_group.py:30
-#: patches/v11_0/rename_supplier_type_to_supplier_group.py:34
-#: patches/v11_0/rename_supplier_type_to_supplier_group.py:38
+#: patches/v11_0/rename_supplier_type_to_supplier_group.py:29
+#: patches/v11_0/rename_supplier_type_to_supplier_group.py:32
+#: patches/v11_0/rename_supplier_type_to_supplier_group.py:36
 #: setup/setup_wizard/operations/install_fixtures.py:148
 #: setup/setup_wizard/operations/install_fixtures.py:150
 #: setup/setup_wizard/operations/install_fixtures.py:157
@@ -5645,7 +5684,7 @@
 msgid "All Territories"
 msgstr ""
 
-#: setup/doctype/company/company.py:258 setup/doctype/company/company.py:274
+#: setup/doctype/company/company.py:255 setup/doctype/company/company.py:268
 msgid "All Warehouses"
 msgstr ""
 
@@ -5660,15 +5699,19 @@
 msgid "All communications including and above this shall be moved into the new Issue"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:1172
+#: stock/doctype/purchase_receipt/purchase_receipt.py:1167
 msgid "All items have already been Invoiced/Returned"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2222
+#: stock/doctype/delivery_note/delivery_note.py:1300
+msgid "All items have already been received"
+msgstr ""
+
+#: stock/doctype/stock_entry/stock_entry.py:2252
 msgid "All items have already been transferred for this Work Order."
 msgstr ""
 
-#: public/js/controllers/transaction.js:2253
+#: public/js/controllers/transaction.js:2254
 msgid "All items in this document already have a linked Quality Inspection."
 msgstr ""
 
@@ -5683,7 +5726,7 @@
 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 ""
 
-#: stock/doctype/delivery_note/delivery_note.py:960
+#: stock/doctype/delivery_note/delivery_note.py:975
 msgid "All these items have already been Invoiced/Returned"
 msgstr ""
 
@@ -5727,7 +5770,7 @@
 msgid "Allocated"
 msgstr ""
 
-#: accounts/report/gross_profit/gross_profit.py:314
+#: accounts/report/gross_profit/gross_profit.py:312
 #: public/js/utils/unreconcile.js:86
 msgid "Allocated Amount"
 msgstr ""
@@ -5797,11 +5840,11 @@
 msgid "Allocated amount"
 msgstr ""
 
-#: accounts/utils.py:623
+#: accounts/utils.py:609
 msgid "Allocated amount cannot be greater than unadjusted amount"
 msgstr ""
 
-#: accounts/utils.py:621
+#: accounts/utils.py:607
 msgid "Allocated amount cannot be negative"
 msgstr ""
 
@@ -5833,7 +5876,7 @@
 msgid "Allocations"
 msgstr ""
 
-#: manufacturing/report/production_planning_report/production_planning_report.py:412
+#: manufacturing/report/production_planning_report/production_planning_report.py:415
 msgid "Allotted Qty"
 msgstr ""
 
@@ -5844,8 +5887,8 @@
 msgid "Allow"
 msgstr ""
 
-#: accounts/doctype/account/account.py:507
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:68
+#: accounts/doctype/account/account.py:502
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:66
 msgid "Allow Account Creation Against Child Company"
 msgstr ""
 
@@ -5897,7 +5940,7 @@
 msgid "Allow Alternative Item"
 msgstr ""
 
-#: stock/doctype/item_alternative/item_alternative.py:67
+#: stock/doctype/item_alternative/item_alternative.py:65
 msgid "Allow Alternative Item must be checked on Item {}"
 msgstr ""
 
@@ -6037,7 +6080,7 @@
 msgid "Allow Resetting Service Level Agreement"
 msgstr ""
 
-#: support/doctype/service_level_agreement/service_level_agreement.py:780
+#: support/doctype/service_level_agreement/service_level_agreement.py:775
 msgid "Allow Resetting Service Level Agreement from Support Settings."
 msgstr ""
 
@@ -6226,11 +6269,11 @@
 msgid "Allows to keep aside a specific quantity of inventory for a particular order."
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:792
+#: stock/doctype/pick_list/pick_list.py:785
 msgid "Already Picked"
 msgstr ""
 
-#: stock/doctype/item_alternative/item_alternative.py:83
+#: stock/doctype/item_alternative/item_alternative.py:81
 msgid "Already record exists for the item {0}"
 msgstr ""
 
@@ -6239,7 +6282,7 @@
 msgstr ""
 
 #: manufacturing/doctype/bom/bom.js:152
-#: manufacturing/doctype/work_order/work_order.js:169 public/js/utils.js:519
+#: manufacturing/doctype/work_order/work_order.js:169 public/js/utils.js:517
 #: stock/doctype/stock_entry/stock_entry.js:245
 msgid "Alternate Item"
 msgstr ""
@@ -6264,7 +6307,7 @@
 msgid "Alternative item must not be same as item code"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:378
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:376
 msgid "Alternatively, you can download the template and fill your data in."
 msgstr ""
 
@@ -6730,20 +6773,20 @@
 msgid "Amended From"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:579
+#: accounts/doctype/journal_entry/journal_entry.js:582
 #: accounts/doctype/pos_closing_entry/closing_voucher_details.html:41
 #: accounts/doctype/pos_closing_entry/closing_voucher_details.html:67
 #: accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.py:45
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:80
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:43
-#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:270
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:322
+#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:274
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:327
 #: accounts/report/payment_ledger/payment_ledger.py:194
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:43
 #: accounts/report/share_balance/share_balance.py:61
 #: accounts/report/share_ledger/share_ledger.py:57
-#: buying/report/purchase_order_analysis/purchase_order_analysis.py:239
+#: buying/report/purchase_order_analysis/purchase_order_analysis.py:235
 #: selling/doctype/quotation/quotation.js:298
 #: selling/page/point_of_sale/pos_item_cart.js:46
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:52
@@ -7275,24 +7318,44 @@
 msgid "Amount in customer's currency"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1128
+#: accounts/doctype/payment_entry/payment_entry.py:1135
 msgid "Amount {0} {1} against {2} {3}"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1136
+#: accounts/doctype/payment_entry/payment_entry.py:1146
 msgid "Amount {0} {1} deducted against {2}"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1104
+#: accounts/doctype/payment_entry/payment_entry.py:1112
 msgid "Amount {0} {1} transferred from {2} to {3}"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1111
+#: accounts/doctype/payment_entry/payment_entry.py:1118
 msgid "Amount {0} {1} {2} {3}"
 msgstr ""
 
-#: controllers/trends.py:241 controllers/trends.py:253
-#: controllers/trends.py:258
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Ampere"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Ampere-Hour"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Ampere-Minute"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Ampere-Second"
+msgstr ""
+
+#: controllers/trends.py:237 controllers/trends.py:249
+#: controllers/trends.py:254
 msgid "Amt"
 msgstr ""
 
@@ -7301,7 +7364,7 @@
 msgid "An Item Group is a way to classify items based on types."
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:408
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:405
 msgid "An error has been appeared while reposting item valuation via {0}"
 msgstr ""
 
@@ -7310,15 +7373,15 @@
 msgid "An error has occurred during {0}. Check {1} for more details"
 msgstr ""
 
-#: public/js/controllers/buying.js:292 public/js/utils/sales_common.js:408
+#: public/js/controllers/buying.js:292 public/js/utils/sales_common.js:405
 msgid "An error occurred during the update process"
 msgstr ""
 
-#: stock/reorder_item.py:372
+#: stock/reorder_item.py:371
 msgid "An error occurred for certain Items while creating Material Requests based on Re-order level. Please rectify these issues :"
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:239
+#: accounts/doctype/budget/budget.py:232
 msgid "Annual"
 msgstr ""
 
@@ -7356,15 +7419,15 @@
 msgid "Annual Revenue"
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:82
+#: accounts/doctype/budget/budget.py:83
 msgid "Another Budget record '{0}' already exists against {1} '{2}' and account '{3}' for fiscal year {4}"
 msgstr ""
 
-#: accounts/doctype/cost_center_allocation/cost_center_allocation.py:109
+#: accounts/doctype/cost_center_allocation/cost_center_allocation.py:107
 msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
 msgstr ""
 
-#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:133
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:132
 msgid "Another Period Closing Entry {0} has been made after {1}"
 msgstr ""
 
@@ -7394,7 +7457,7 @@
 msgid "Applicable Dimension"
 msgstr ""
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:221
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:219
 msgid "Applicable For"
 msgstr ""
 
@@ -7482,15 +7545,15 @@
 msgid "Applicable for external driver"
 msgstr ""
 
-#: regional/italy/setup.py:161
+#: regional/italy/setup.py:162
 msgid "Applicable if the company is SpA, SApA or SRL"
 msgstr ""
 
-#: regional/italy/setup.py:170
+#: regional/italy/setup.py:171
 msgid "Applicable if the company is a limited liability company"
 msgstr ""
 
-#: regional/italy/setup.py:121
+#: regional/italy/setup.py:122
 msgid "Applicable if the company is an Individual or a Proprietorship"
 msgstr ""
 
@@ -7536,7 +7599,7 @@
 msgid "Applied on each reading."
 msgstr ""
 
-#: stock/doctype/putaway_rule/putaway_rule.py:185
+#: stock/doctype/putaway_rule/putaway_rule.py:183
 msgid "Applied putaway rules."
 msgstr ""
 
@@ -7860,6 +7923,11 @@
 msgid "Approximately match the description/party name against parties"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Are"
+msgstr ""
+
 #: public/js/utils/demo.js:20
 msgid "Are you sure you want to clear all demo data?"
 msgstr ""
@@ -7872,6 +7940,11 @@
 msgid "Are you sure you want to restart this subscription?"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Area"
+msgstr ""
+
 #. Label of a Float field in DocType 'Location'
 #: assets/doctype/location/location.json
 msgctxt "Location"
@@ -7884,10 +7957,15 @@
 msgid "Area UOM"
 msgstr ""
 
-#: manufacturing/report/production_planning_report/production_planning_report.py:420
+#: manufacturing/report/production_planning_report/production_planning_report.py:423
 msgid "Arrival Quantity"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Arshin"
+msgstr ""
+
 #: stock/report/serial_no_ledger/serial_no_ledger.js:57
 #: stock/report/stock_ageing/stock_ageing.js:16
 #: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:30
@@ -7913,7 +7991,7 @@
 msgid "As the field {0} is enabled, the value of the field {1} should be more than 1."
 msgstr ""
 
-#: stock/doctype/item/item.py:965
+#: stock/doctype/item/item.py:953
 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}."
 msgstr ""
 
@@ -7925,16 +8003,16 @@
 msgid "As there are reserved stock, you cannot disable {0}."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:915
+#: manufacturing/doctype/production_plan/production_plan.py:916
 msgid "As there are sufficient Sub Assembly Items, Work Order is not required for Warehouse {0}."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:1620
+#: manufacturing/doctype/production_plan/production_plan.py:1614
 msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}."
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:167
-#: stock/doctype/stock_settings/stock_settings.py:181
+#: stock/doctype/stock_settings/stock_settings.py:166
+#: stock/doctype/stock_settings/stock_settings.py:178
 msgid "As {0} is enabled, you can not enable {1}."
 msgstr ""
 
@@ -7949,7 +8027,7 @@
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:30
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:124
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:44
-#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:365
+#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:357
 #: assets/doctype/asset/asset.json
 #: stock/doctype/purchase_receipt/purchase_receipt.js:200
 msgid "Asset"
@@ -8099,10 +8177,10 @@
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:36
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:174
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:37
-#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:355
+#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:347
 #: assets/doctype/asset_category/asset_category.json
 #: assets/report/fixed_asset_register/fixed_asset_register.js:23
-#: assets/report/fixed_asset_register/fixed_asset_register.py:418
+#: assets/report/fixed_asset_register/fixed_asset_register.py:408
 msgid "Asset Category"
 msgstr ""
 
@@ -8160,7 +8238,7 @@
 msgid "Asset Category Name"
 msgstr ""
 
-#: stock/doctype/item/item.py:304
+#: stock/doctype/item/item.py:303
 msgid "Asset Category is mandatory for Fixed Asset item"
 msgstr ""
 
@@ -8194,13 +8272,13 @@
 msgid "Asset Depreciation Schedule"
 msgstr ""
 
-#: assets/doctype/asset_shift_allocation/asset_shift_allocation.py:77
+#: assets/doctype/asset_shift_allocation/asset_shift_allocation.py:75
 msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
 msgstr ""
 
-#: assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:893
-#: assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:939
-#: assets/doctype/asset_shift_allocation/asset_shift_allocation.py:83
+#: assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:894
+#: assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:938
+#: assets/doctype/asset_shift_allocation/asset_shift_allocation.py:81
 msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
 msgstr ""
 
@@ -8234,7 +8312,7 @@
 msgid "Asset Finance Book"
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.py:410
+#: assets/report/fixed_asset_register/fixed_asset_register.py:400
 msgid "Asset ID"
 msgstr ""
 
@@ -8322,11 +8400,11 @@
 msgid "Asset Movement Item"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:905
+#: assets/doctype/asset/asset.py:897
 msgid "Asset Movement record {0} created"
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.py:416
+#: assets/report/fixed_asset_register/fixed_asset_register.py:406
 msgid "Asset Name"
 msgstr ""
 
@@ -8459,7 +8537,7 @@
 msgid "Asset Shift Factor"
 msgstr ""
 
-#: assets/doctype/asset_shift_factor/asset_shift_factor.py:34
+#: assets/doctype/asset_shift_factor/asset_shift_factor.py:32
 msgid "Asset Shift Factor {0} is set as default currently. Please change it first."
 msgstr ""
 
@@ -8469,10 +8547,10 @@
 msgid "Asset Status"
 msgstr ""
 
-#: assets/dashboard_fixtures.py:178
-#: assets/report/fixed_asset_register/fixed_asset_register.py:201
-#: assets/report/fixed_asset_register/fixed_asset_register.py:400
-#: assets/report/fixed_asset_register/fixed_asset_register.py:440
+#: assets/dashboard_fixtures.py:175
+#: assets/report/fixed_asset_register/fixed_asset_register.py:197
+#: assets/report/fixed_asset_register/fixed_asset_register.py:390
+#: assets/report/fixed_asset_register/fixed_asset_register.py:430
 msgid "Asset Value"
 msgstr ""
 
@@ -8504,7 +8582,7 @@
 msgstr ""
 
 #. Label of a chart in the Assets Workspace
-#: assets/dashboard_fixtures.py:57 assets/workspace/assets/assets.json
+#: assets/dashboard_fixtures.py:56 assets/workspace/assets/assets.json
 msgid "Asset Value Analytics"
 msgstr ""
 
@@ -8512,11 +8590,11 @@
 msgid "Asset cancelled"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:508
+#: assets/doctype/asset/asset.py:503
 msgid "Asset cannot be cancelled, as it is already {0}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:693
+#: assets/doctype/asset_capitalization/asset_capitalization.py:688
 msgid "Asset capitalized after Asset Capitalization {0} was submitted"
 msgstr ""
 
@@ -8524,15 +8602,15 @@
 msgid "Asset created"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:639
+#: assets/doctype/asset_capitalization/asset_capitalization.py:634
 msgid "Asset created after Asset Capitalization {0} was submitted"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1160
+#: assets/doctype/asset/asset.py:1138
 msgid "Asset created after being split from Asset {0}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:701
+#: assets/doctype/asset_capitalization/asset_capitalization.py:696
 msgid "Asset decapitalized after Asset Capitalization {0} was submitted"
 msgstr ""
 
@@ -8540,7 +8618,7 @@
 msgid "Asset deleted"
 msgstr ""
 
-#: assets/doctype/asset_movement/asset_movement.py:172
+#: assets/doctype/asset_movement/asset_movement.py:180
 msgid "Asset issued to Employee {0}"
 msgstr ""
 
@@ -8548,31 +8626,31 @@
 msgid "Asset out of order due to Asset Repair {0}"
 msgstr ""
 
-#: assets/doctype/asset_movement/asset_movement.py:159
+#: assets/doctype/asset_movement/asset_movement.py:165
 msgid "Asset received at Location {0} and issued to Employee {1}"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:507
+#: assets/doctype/asset/depreciation.py:496
 msgid "Asset restored"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:709
+#: assets/doctype/asset_capitalization/asset_capitalization.py:704
 msgid "Asset restored after Asset Capitalization {0} was cancelled"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1331
+#: accounts/doctype/sales_invoice/sales_invoice.py:1335
 msgid "Asset returned"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:481
+#: assets/doctype/asset/depreciation.py:470
 msgid "Asset scrapped"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:483
+#: assets/doctype/asset/depreciation.py:472
 msgid "Asset scrapped via Journal Entry {0}"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1365
+#: accounts/doctype/sales_invoice/sales_invoice.py:1371
 msgid "Asset sold"
 msgstr ""
 
@@ -8580,11 +8658,11 @@
 msgid "Asset submitted"
 msgstr ""
 
-#: assets/doctype/asset_movement/asset_movement.py:167
+#: assets/doctype/asset_movement/asset_movement.py:173
 msgid "Asset transferred to Location {0}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1084
+#: assets/doctype/asset/asset.py:1072
 msgid "Asset updated after being split into Asset {0}"
 msgstr ""
 
@@ -8596,15 +8674,15 @@
 msgid "Asset updated after completion of Asset Repair {0}"
 msgstr ""
 
-#: assets/doctype/asset_movement/asset_movement.py:98
+#: assets/doctype/asset_movement/asset_movement.py:106
 msgid "Asset {0} cannot be received at a location and given to an employee in a single movement"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:447
+#: assets/doctype/asset/depreciation.py:439
 msgid "Asset {0} cannot be scrapped, as it is already {1}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:243
+#: assets/doctype/asset_capitalization/asset_capitalization.py:241
 msgid "Asset {0} does not belong to Item {1}"
 msgstr ""
 
@@ -8612,7 +8690,7 @@
 msgid "Asset {0} does not belong to company {1}"
 msgstr ""
 
-#: assets/doctype/asset_movement/asset_movement.py:110
+#: assets/doctype/asset_movement/asset_movement.py:118
 msgid "Asset {0} does not belongs to the custodian {1}"
 msgstr ""
 
@@ -8620,24 +8698,24 @@
 msgid "Asset {0} does not belongs to the location {1}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:765
-#: assets/doctype/asset_capitalization/asset_capitalization.py:865
+#: assets/doctype/asset_capitalization/asset_capitalization.py:760
+#: assets/doctype/asset_capitalization/asset_capitalization.py:858
 msgid "Asset {0} does not exist"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:645
+#: assets/doctype/asset_capitalization/asset_capitalization.py:640
 msgid "Asset {0} has been created. Please set the depreciation details if any and submit it."
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:667
+#: assets/doctype/asset_capitalization/asset_capitalization.py:662
 msgid "Asset {0} has been updated. Please set the depreciation details if any and submit it."
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:444
+#: assets/doctype/asset/depreciation.py:437
 msgid "Asset {0} must be submitted"
 msgstr ""
 
-#: assets/doctype/asset_shift_allocation/asset_shift_allocation.py:262
+#: assets/doctype/asset_shift_allocation/asset_shift_allocation.py:256
 msgid "Asset's depreciation schedule updated after Asset Shift Allocation {0}"
 msgstr ""
 
@@ -8652,7 +8730,7 @@
 #. Name of a Workspace
 #. Label of a Card Break in the Assets Workspace
 #: accounts/doctype/finance_book/finance_book_dashboard.py:9
-#: accounts/report/balance_sheet/balance_sheet.py:238
+#: accounts/report/balance_sheet/balance_sheet.py:237
 #: assets/workspace/assets/assets.json
 msgid "Assets"
 msgstr ""
@@ -8675,7 +8753,7 @@
 msgid "Assets"
 msgstr ""
 
-#: controllers/buying_controller.py:757
+#: controllers/buying_controller.py:760
 msgid "Assets not created for {0}. You will have to create asset manually."
 msgstr ""
 
@@ -8684,7 +8762,7 @@
 msgid "Assets, Depreciations, Repairs, and more."
 msgstr ""
 
-#: controllers/buying_controller.py:745
+#: controllers/buying_controller.py:748
 msgid "Asset{} {assets_link} created for {}"
 msgstr ""
 
@@ -8726,24 +8804,24 @@
 msgid "Assignment Conditions"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1015
+#: assets/doctype/asset/asset.py:1003
 msgid "At least one asset has to be selected."
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.py:789
+#: accounts/doctype/pos_invoice/pos_invoice.py:790
 msgid "At least one invoice has to be selected."
 msgstr ""
 
-#: controllers/sales_and_purchase_return.py:144
+#: controllers/sales_and_purchase_return.py:142
 msgid "At least one item should be entered with negative quantity in return document"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.py:405
-#: accounts/doctype/sales_invoice/sales_invoice.py:522
+#: accounts/doctype/pos_invoice/pos_invoice.py:407
+#: accounts/doctype/sales_invoice/sales_invoice.py:518
 msgid "At least one mode of payment is required for POS invoice."
 msgstr ""
 
-#: setup/doctype/terms_and_conditions/terms_and_conditions.py:39
+#: setup/doctype/terms_and_conditions/terms_and_conditions.py:34
 msgid "At least one of the Applicable Modules should be selected"
 msgstr ""
 
@@ -8751,7 +8829,7 @@
 msgid "At least one of the Selling or Buying must be selected"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:598
+#: stock/doctype/stock_entry/stock_entry.py:599
 msgid "At least one warehouse is mandatory"
 msgstr ""
 
@@ -8759,18 +8837,23 @@
 msgid "At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2}"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:577
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:609
 msgid "At row {0}: Batch No is mandatory for Item {1}"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:569
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:601
 msgid "At row {0}: Serial No is mandatory for Item {1}"
 msgstr ""
 
-#: controllers/stock_controller.py:301
+#: controllers/stock_controller.py:317
 msgid "At row {0}: Serial and Batch Bundle {1} has already created. Please remove the values from the serial no or batch no fields."
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Atmosphere"
+msgstr ""
+
 #. Description of the 'File to Rename' (Attach) field in DocType 'Rename Tool'
 #: utilities/doctype/rename_tool/rename_tool.json
 msgctxt "Rename Tool"
@@ -8840,19 +8923,19 @@
 msgid "Attribute Value"
 msgstr ""
 
-#: stock/doctype/item/item.py:911
+#: stock/doctype/item/item.py:899
 msgid "Attribute table is mandatory"
 msgstr ""
 
-#: stock/doctype/item_attribute/item_attribute.py:96
+#: stock/doctype/item_attribute/item_attribute.py:97
 msgid "Attribute value: {0} must appear only once"
 msgstr ""
 
-#: stock/doctype/item/item.py:915
+#: stock/doctype/item/item.py:903
 msgid "Attribute {0} selected multiple times in Attributes Table"
 msgstr ""
 
-#: stock/doctype/item/item.py:846
+#: stock/doctype/item/item.py:835
 msgid "Attributes"
 msgstr ""
 
@@ -9024,12 +9107,12 @@
 msgid "Auto Reconcile Payments"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:413
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:408
 msgid "Auto Reconciliation"
 msgstr ""
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py:145
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py:193
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py:143
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py:191
 msgid "Auto Reconciliation of Payments has been disabled. Enable it through {0}"
 msgstr ""
 
@@ -9148,7 +9231,7 @@
 msgid "Auto re-order"
 msgstr ""
 
-#: public/js/controllers/buying.js:290 public/js/utils/sales_common.js:403
+#: public/js/controllers/buying.js:290 public/js/utils/sales_common.js:400
 msgid "Auto repeat document updated"
 msgstr ""
 
@@ -9206,7 +9289,7 @@
 msgid "Availability Of Slots"
 msgstr ""
 
-#: manufacturing/report/production_planning_report/production_planning_report.py:369
+#: manufacturing/report/production_planning_report/production_planning_report.py:372
 msgid "Available"
 msgstr ""
 
@@ -9228,12 +9311,12 @@
 msgid "Available Batch Qty at Warehouse"
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.py:427
+#: assets/report/fixed_asset_register/fixed_asset_register.py:417
 msgid "Available For Use Date"
 msgstr ""
 
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:82
-#: public/js/utils.js:579 stock/report/stock_ageing/stock_ageing.py:156
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:80
+#: public/js/utils.js:577 stock/report/stock_ageing/stock_ageing.py:155
 msgid "Available Qty"
 msgstr ""
 
@@ -9324,7 +9407,7 @@
 msgid "Available Stock for Packing Items"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:272
+#: assets/doctype/asset/asset.py:270
 msgid "Available for use date is required"
 msgstr ""
 
@@ -9342,13 +9425,13 @@
 msgid "Available-for-use Date"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:357
+#: assets/doctype/asset/asset.py:353
 msgid "Available-for-use Date should be after purchase date"
 msgstr ""
 
-#: stock/report/stock_ageing/stock_ageing.py:157
-#: stock/report/stock_ageing/stock_ageing.py:191
-#: stock/report/stock_balance/stock_balance.py:485
+#: stock/report/stock_ageing/stock_ageing.py:156
+#: stock/report/stock_ageing/stock_ageing.py:190
+#: stock/report/stock_balance/stock_balance.py:484
 msgid "Average Age"
 msgstr ""
 
@@ -9378,7 +9461,7 @@
 msgid "Average time taken by the supplier to deliver"
 msgstr ""
 
-#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:65
+#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:63
 msgid "Avg Daily Outgoing"
 msgstr ""
 
@@ -9400,7 +9483,7 @@
 msgid "Avg. Selling Price List Rate"
 msgstr ""
 
-#: accounts/report/gross_profit/gross_profit.py:259
+#: accounts/report/gross_profit/gross_profit.py:257
 msgid "Avg. Selling Rate"
 msgstr ""
 
@@ -9438,7 +9521,7 @@
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:109
 #: selling/doctype/sales_order/sales_order.js:941
 #: stock/doctype/material_request/material_request.js:300
-#: stock/doctype/stock_entry/stock_entry.js:617
+#: stock/doctype/stock_entry/stock_entry.js:631
 #: stock/report/bom_search/bom_search.py:38
 msgid "BOM"
 msgstr ""
@@ -9509,7 +9592,7 @@
 msgid "BOM 1"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1347
+#: manufacturing/doctype/bom/bom.py:1338
 msgid "BOM 1 {0} and BOM 2 {1} should not be same"
 msgstr ""
 
@@ -9769,7 +9852,7 @@
 msgid "BOM Update Tool Log with job status maintained"
 msgstr ""
 
-#: manufacturing/doctype/bom_update_log/bom_update_log.py:99
+#: manufacturing/doctype/bom_update_log/bom_update_log.py:97
 msgid "BOM Updation already in progress. Please wait until {0} is complete."
 msgstr ""
 
@@ -9792,32 +9875,32 @@
 msgid "BOM Website Operation"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.js:1145
+#: stock/doctype/stock_entry/stock_entry.js:1161
 msgid "BOM and Manufacturing Quantity are required"
 msgstr ""
 
 #: stock/doctype/material_request/material_request.js:332
-#: stock/doctype/stock_entry/stock_entry.js:669
+#: stock/doctype/stock_entry/stock_entry.js:683
 msgid "BOM does not contain any stock item"
 msgstr ""
 
-#: manufacturing/doctype/bom_update_log/bom_updation_utils.py:87
+#: manufacturing/doctype/bom_update_log/bom_updation_utils.py:85
 msgid "BOM recursion: {0} cannot be child of {1}"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:631
+#: manufacturing/doctype/bom/bom.py:626
 msgid "BOM recursion: {1} cannot be parent or child of {0}"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1222
+#: manufacturing/doctype/bom/bom.py:1215
 msgid "BOM {0} does not belong to Item {1}"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1204
+#: manufacturing/doctype/bom/bom.py:1197
 msgid "BOM {0} must be active"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1207
+#: manufacturing/doctype/bom/bom.py:1200
 msgid "BOM {0} must be submitted"
 msgstr ""
 
@@ -9827,19 +9910,19 @@
 msgid "BOMs Updated"
 msgstr ""
 
-#: manufacturing/doctype/bom_creator/bom_creator.py:252
+#: manufacturing/doctype/bom_creator/bom_creator.py:251
 msgid "BOMs created successfully"
 msgstr ""
 
-#: manufacturing/doctype/bom_creator/bom_creator.py:262
+#: manufacturing/doctype/bom_creator/bom_creator.py:261
 msgid "BOMs creation failed"
 msgstr ""
 
-#: manufacturing/doctype/bom_creator/bom_creator.py:215
+#: manufacturing/doctype/bom_creator/bom_creator.py:213
 msgid "BOMs creation has been enqueued, kindly check the status after some time"
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:334
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:338
 msgid "Backdated Stock Entry"
 msgstr ""
 
@@ -9867,8 +9950,8 @@
 
 #: accounts/report/account_balance/account_balance.py:36
 #: accounts/report/purchase_register/purchase_register.py:242
-#: accounts/report/sales_register/sales_register.py:276
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:47
+#: accounts/report/sales_register/sales_register.py:277
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:46
 msgid "Balance"
 msgstr ""
 
@@ -9877,7 +9960,7 @@
 msgid "Balance (Dr - Cr)"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:597
+#: accounts/report/general_ledger/general_ledger.py:588
 msgid "Balance ({0})"
 msgstr ""
 
@@ -9894,7 +9977,7 @@
 msgstr ""
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:82
-#: stock/report/stock_balance/stock_balance.py:413
+#: stock/report/stock_balance/stock_balance.py:412
 #: stock/report/stock_ledger/stock_ledger.py:226
 msgid "Balance Qty"
 msgstr ""
@@ -9945,12 +10028,12 @@
 msgid "Balance Stock Value"
 msgstr ""
 
-#: stock/report/stock_balance/stock_balance.py:420
+#: stock/report/stock_balance/stock_balance.py:419
 #: stock/report/stock_ledger/stock_ledger.py:290
 msgid "Balance Value"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:309
+#: accounts/doctype/gl_entry/gl_entry.py:312
 msgid "Balance for Account {0} must always be {1}"
 msgstr ""
 
@@ -10043,7 +10126,7 @@
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.js:21
 #: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:16
 #: buying/doctype/supplier/supplier.js:108
-#: setup/setup_wizard/operations/install_fixtures.py:492
+#: setup/setup_wizard/operations/install_fixtures.py:483
 msgid "Bank Account"
 msgstr ""
 
@@ -10306,7 +10389,7 @@
 msgid "Bank Statement Import"
 msgstr ""
 
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:43
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:40
 msgid "Bank Statement balance as per General Ledger"
 msgstr ""
 
@@ -10355,7 +10438,7 @@
 msgid "Bank Transaction {0} added as Payment Entry"
 msgstr ""
 
-#: accounts/doctype/bank_transaction/bank_transaction.py:127
+#: accounts/doctype/bank_transaction/bank_transaction.py:129
 msgid "Bank Transaction {0} is already fully reconciled"
 msgstr ""
 
@@ -10363,7 +10446,7 @@
 msgid "Bank Transaction {0} updated"
 msgstr ""
 
-#: setup/setup_wizard/operations/install_fixtures.py:525
+#: setup/setup_wizard/operations/install_fixtures.py:516
 msgid "Bank account cannot be named as {0}"
 msgstr ""
 
@@ -10375,7 +10458,7 @@
 msgid "Bank accounts added"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:313
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:311
 msgid "Bank transaction creation error"
 msgstr ""
 
@@ -10400,6 +10483,11 @@
 msgid "Banking"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Bar"
+msgstr ""
+
 #: public/js/utils/barcode_scanner.js:282
 msgid "Barcode"
 msgstr ""
@@ -10458,11 +10546,11 @@
 msgid "Barcode Type"
 msgstr ""
 
-#: stock/doctype/item/item.py:451
+#: stock/doctype/item/item.py:450
 msgid "Barcode {0} already used in Item {1}"
 msgstr ""
 
-#: stock/doctype/item/item.py:464
+#: stock/doctype/item/item.py:465
 msgid "Barcode {0} is not a valid {1} code"
 msgstr ""
 
@@ -10473,6 +10561,21 @@
 msgid "Barcodes"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Barleycorn"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Barrel (Oil)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Barrel(Beer)"
+msgstr ""
+
 #. Label of a Currency field in DocType 'BOM Creator Item'
 #: manufacturing/doctype/bom_creator_item/bom_creator_item.json
 msgctxt "BOM Creator Item"
@@ -10527,7 +10630,7 @@
 msgid "Base Tax Withholding Net Total"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:239
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:237
 msgid "Base Total"
 msgstr ""
 
@@ -10664,7 +10767,7 @@
 #: stock/doctype/batch/batch.json
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.py:34
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:78
-#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:159
+#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:158
 #: stock/report/stock_ledger/stock_ledger.py:312
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:148
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:78
@@ -10707,13 +10810,13 @@
 msgstr ""
 
 #: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:89
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:117
-#: public/js/controllers/transaction.js:2193
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:115
+#: public/js/controllers/transaction.js:2194
 #: public/js/utils/barcode_scanner.js:260
 #: public/js/utils/serial_no_batch_selector.js:372
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.js:59
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:80
-#: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:156
+#: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:154
 #: stock/report/stock_ledger/stock_ledger.js:59
 msgid "Batch No"
 msgstr ""
@@ -10838,15 +10941,15 @@
 msgid "Batch No"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:580
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:612
 msgid "Batch No is mandatory"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2137
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2163
 msgid "Batch No {0} does not exists"
 msgstr ""
 
-#: stock/utils.py:638
+#: stock/utils.py:623
 msgid "Batch No {0} is linked with Item {1} which has serial no. Please scan serial no instead."
 msgstr ""
 
@@ -10862,7 +10965,7 @@
 msgid "Batch Nos"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1120
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1151
 msgid "Batch Nos are created successfully"
 msgstr ""
 
@@ -10872,7 +10975,7 @@
 msgid "Batch Number Series"
 msgstr ""
 
-#: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:157
+#: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:155
 msgid "Batch Qty"
 msgstr ""
 
@@ -10922,7 +11025,7 @@
 msgid "Batch and Serial No"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:496
+#: manufacturing/doctype/work_order/work_order.py:490
 msgid "Batch not created for item {} since it does not have a batch series."
 msgstr ""
 
@@ -10930,12 +11033,12 @@
 msgid "Batch {0} and Warehouse"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2379
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:283
+#: stock/doctype/stock_entry/stock_entry.py:2410
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:284
 msgid "Batch {0} of Item {1} has expired."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2381
+#: stock/doctype/stock_entry/stock_entry.py:2416
 msgid "Batch {0} of Item {1} is disabled."
 msgstr ""
 
@@ -10946,7 +11049,7 @@
 msgid "Batch-Wise Balance History"
 msgstr ""
 
-#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:165
+#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:164
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:160
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:84
 msgid "Batchwise Valuation"
@@ -10971,11 +11074,11 @@
 msgid "Beginning of the current subscription period"
 msgstr ""
 
-#: accounts/doctype/subscription/subscription.py:341
+#: accounts/doctype/subscription/subscription.py:332
 msgid "Below Subscription Plans are of different currency to the party default billing currency/Company currency: {0}"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1069
+#: accounts/report/accounts_receivable/accounts_receivable.py:1059
 #: accounts/report/purchase_register/purchase_register.py:214
 msgid "Bill Date"
 msgstr ""
@@ -10992,7 +11095,7 @@
 msgid "Bill Date"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1068
+#: accounts/report/accounts_receivable/accounts_receivable.py:1058
 #: accounts/report/purchase_register/purchase_register.py:213
 msgid "Bill No"
 msgstr ""
@@ -11017,11 +11120,11 @@
 
 #. Title of an Onboarding Step
 #. Label of a Card Break in the Manufacturing Workspace
-#: manufacturing/doctype/bom/bom.py:1088
+#: manufacturing/doctype/bom/bom.py:1083
 #: manufacturing/onboarding_step/create_bom/create_bom.json
 #: manufacturing/workspace/manufacturing/manufacturing.json
 #: stock/doctype/material_request/material_request.js:99
-#: stock/doctype/stock_entry/stock_entry.js:599
+#: stock/doctype/stock_entry/stock_entry.js:613
 msgid "Bill of Materials"
 msgstr ""
 
@@ -11031,7 +11134,7 @@
 msgid "Bill of Materials"
 msgstr ""
 
-#: controllers/website_list_for_contact.py:205
+#: controllers/website_list_for_contact.py:203
 #: projects/doctype/timesheet/timesheet_list.js:5
 msgid "Billed"
 msgstr ""
@@ -11044,7 +11147,7 @@
 
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:50
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:50
-#: buying/report/purchase_order_analysis/purchase_order_analysis.py:247
+#: buying/report/purchase_order_analysis/purchase_order_analysis.py:243
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:107
 #: selling/report/sales_order_analysis/sales_order_analysis.py:298
 msgid "Billed Amount"
@@ -11079,7 +11182,7 @@
 msgid "Billed Items To Be Received"
 msgstr ""
 
-#: buying/report/purchase_order_analysis/purchase_order_analysis.py:225
+#: buying/report/purchase_order_analysis/purchase_order_analysis.py:221
 #: selling/report/sales_order_analysis/sales_order_analysis.py:276
 msgid "Billed Qty"
 msgstr ""
@@ -11098,20 +11201,20 @@
 msgstr ""
 
 #. Label of a Section Break field in DocType 'Delivery Note'
-#. Label of a Small Text field in DocType 'Delivery Note'
+#. Label of a Text Editor field in DocType 'Delivery Note'
 #: stock/doctype/delivery_note/delivery_note.json
 msgctxt "Delivery Note"
 msgid "Billing Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Purchase Invoice'
+#. Label of a Text Editor field in DocType 'Purchase Invoice'
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
 msgid "Billing Address"
 msgstr ""
 
 #. Label of a Link field in DocType 'Purchase Receipt'
-#. Label of a Small Text field in DocType 'Purchase Receipt'
+#. Label of a Text Editor field in DocType 'Purchase Receipt'
 #: stock/doctype/purchase_receipt/purchase_receipt.json
 msgctxt "Purchase Receipt"
 msgid "Billing Address"
@@ -11135,31 +11238,31 @@
 msgid "Billing Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Subcontracting Receipt'
+#. Label of a Text Editor field in DocType 'Subcontracting Receipt'
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 msgctxt "Subcontracting Receipt"
 msgid "Billing Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Purchase Order'
+#. Label of a Text Editor field in DocType 'Purchase Order'
 #: buying/doctype/purchase_order/purchase_order.json
 msgctxt "Purchase Order"
 msgid "Billing Address Details"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Request for Quotation'
+#. Label of a Text Editor field in DocType 'Request for Quotation'
 #: buying/doctype/request_for_quotation/request_for_quotation.json
 msgctxt "Request for Quotation"
 msgid "Billing Address Details"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Subcontracting Order'
+#. Label of a Text Editor field in DocType 'Subcontracting Order'
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
 msgctxt "Subcontracting Order"
 msgid "Billing Address Details"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Supplier Quotation'
+#. Label of a Text Editor field in DocType 'Supplier Quotation'
 #: buying/doctype/supplier_quotation/supplier_quotation.json
 msgctxt "Supplier Quotation"
 msgid "Billing Address Details"
@@ -11266,7 +11369,7 @@
 msgid "Billing Interval Count cannot be less than 1"
 msgstr ""
 
-#: accounts/doctype/subscription/subscription.py:383
+#: accounts/doctype/subscription/subscription.py:375
 msgid "Billing Interval in Subscription Plan must be Month to follow calendar months"
 msgstr ""
 
@@ -11304,7 +11407,7 @@
 msgid "Billing Zipcode"
 msgstr ""
 
-#: accounts/party.py:579
+#: accounts/party.py:557
 msgid "Billing currency must be equal to either default company's currency or party account currency"
 msgstr ""
 
@@ -11319,6 +11422,11 @@
 msgid "Bio / Cover Letter"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Biot"
+msgstr ""
+
 #. Name of a DocType
 #: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.json
 msgid "Bisect Accounting Statements"
@@ -11561,11 +11669,11 @@
 msgid "Booked Fixed Asset"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse.py:141
+#: stock/doctype/warehouse/warehouse.py:139
 msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
 msgstr ""
 
-#: accounts/general_ledger.py:694
+#: accounts/general_ledger.py:684
 msgid "Books have been closed till the period ending on {0}"
 msgstr ""
 
@@ -11576,10 +11684,15 @@
 msgid "Both"
 msgstr ""
 
-#: accounts/doctype/subscription/subscription.py:359
+#: accounts/doctype/subscription/subscription.py:351
 msgid "Both Trial Period Start Date and Trial Period End Date must be set"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Box"
+msgstr ""
+
 #. Name of a DocType
 #: setup/doctype/branch/branch.json
 msgid "Branch"
@@ -11628,7 +11741,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/report/gross_profit/gross_profit.py:243
+#: accounts/report/gross_profit/gross_profit.py:241
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:47
 #: accounts/report/sales_register/sales_register.js:64
 #: public/js/stock_analytics.js:58 public/js/stock_analytics.js:93
@@ -11640,13 +11753,13 @@
 #: stock/report/item_price_stock/item_price_stock.py:25
 #: stock/report/item_prices/item_prices.py:53
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js:27
-#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:58
+#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:56
 #: stock/report/product_bundle_balance/product_bundle_balance.js:36
 #: stock/report/product_bundle_balance/product_bundle_balance.py:107
 #: stock/report/stock_ageing/stock_ageing.js:43
-#: stock/report/stock_ageing/stock_ageing.py:135
+#: stock/report/stock_ageing/stock_ageing.py:134
 #: stock/report/stock_analytics/stock_analytics.js:34
-#: stock/report/stock_analytics/stock_analytics.py:45
+#: stock/report/stock_analytics/stock_analytics.py:44
 #: stock/report/stock_ledger/stock_ledger.js:73
 #: stock/report/stock_ledger/stock_ledger.py:254
 #: stock/report/stock_projected_qty/stock_projected_qty.js:45
@@ -11811,6 +11924,36 @@
 msgid "Browse BOM"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Btu (It)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Btu (Mean)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Btu (Th)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Btu/Hour"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Btu/Minutes"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Btu/Seconds"
+msgstr ""
+
 #. Name of a DocType
 #: accounts/doctype/budget/budget.json
 #: accounts/doctype/cost_center/cost_center.js:45
@@ -11819,7 +11962,7 @@
 #: accounts/doctype/cost_center/cost_center_tree.js:81
 #: accounts/report/budget_variance_report/budget_variance_report.py:99
 #: accounts/report/budget_variance_report/budget_variance_report.py:109
-#: accounts/report/budget_variance_report/budget_variance_report.py:386
+#: accounts/report/budget_variance_report/budget_variance_report.py:379
 msgid "Budget"
 msgstr ""
 
@@ -11862,7 +12005,7 @@
 msgid "Budget Detail"
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:285 accounts/doctype/budget/budget.py:287
+#: accounts/doctype/budget/budget.py:282 accounts/doctype/budget/budget.py:284
 msgid "Budget Exceeded"
 msgstr ""
 
@@ -11878,11 +12021,11 @@
 msgid "Budget Variance Report"
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:97
+#: accounts/doctype/budget/budget.py:98
 msgid "Budget cannot be assigned against Group Account {0}"
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:102
+#: accounts/doctype/budget/budget.py:105
 msgid "Budget cannot be assigned against {0}, as it's not an Income or Expense account"
 msgstr ""
 
@@ -11934,6 +12077,16 @@
 msgid "Bundle Qty"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Bushel (UK)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Bushel (US Dry Level)"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'Call Log'
 #: telephony/doctype/call_log/call_log.json
 msgctxt "Call Log"
@@ -12011,7 +12164,7 @@
 msgid "Buying & Selling Settings"
 msgstr ""
 
-#: accounts/report/gross_profit/gross_profit.py:280
+#: accounts/report/gross_profit/gross_profit.py:278
 msgid "Buying Amount"
 msgstr ""
 
@@ -12086,7 +12239,7 @@
 msgid "COGS By Item Group"
 msgstr ""
 
-#: stock/report/cogs_by_item_group/cogs_by_item_group.py:45
+#: stock/report/cogs_by_item_group/cogs_by_item_group.py:44
 msgid "COGS Debit"
 msgstr ""
 
@@ -12138,6 +12291,26 @@
 msgid "CWIP Account"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Caballeria"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Cable Length"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Cable Length (UK)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Cable Length (US)"
+msgstr ""
+
 #. Label of a Select field in DocType 'Shipping Rule'
 #: accounts/doctype/shipping_rule/shipping_rule.json
 msgctxt "Shipping Rule"
@@ -12162,7 +12335,7 @@
 msgid "Calculate Product Bundle Price based on Child Items' Rates"
 msgstr ""
 
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:56
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:53
 msgid "Calculated Bank Statement balance"
 msgstr ""
 
@@ -12185,6 +12358,11 @@
 msgid "Calibration"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Calibre"
+msgstr ""
+
 #: telephony/doctype/call_log/call_log.js:8
 msgid "Call Again"
 msgstr ""
@@ -12243,12 +12421,12 @@
 msgstr ""
 
 #: telephony/doctype/incoming_call_settings/incoming_call_settings.js:58
-#: telephony/doctype/incoming_call_settings/incoming_call_settings.py:49
+#: telephony/doctype/incoming_call_settings/incoming_call_settings.py:48
 msgid "Call Schedule Row {0}: To time slot should always be ahead of From time slot."
 msgstr ""
 
 #: public/js/call_popup/call_popup.js:164
-#: telephony/doctype/call_log/call_log.py:135
+#: telephony/doctype/call_log/call_log.py:133
 msgid "Call Summary"
 msgstr ""
 
@@ -12272,6 +12450,31 @@
 msgid "Callback"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Calorie (Food)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Calorie (It)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Calorie (Mean)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Calorie (Th)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Calorie/Seconds"
+msgstr ""
+
 #. Name of a DocType
 #. Label of a Card Break in the CRM Workspace
 #: crm/doctype/campaign/campaign.json crm/workspace/crm/crm.json
@@ -12404,15 +12607,15 @@
 msgid "Campaign Schedules"
 msgstr ""
 
-#: setup/doctype/authorization_control/authorization_control.py:58
+#: setup/doctype/authorization_control/authorization_control.py:60
 msgid "Can be approved by {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:1465
+#: manufacturing/doctype/work_order/work_order.py:1460
 msgid "Can not close Work Order. Since {0} Job Cards are in Work In Progress state."
 msgstr ""
 
-#: accounts/report/pos_register/pos_register.py:127
+#: accounts/report/pos_register/pos_register.py:123
 msgid "Can not filter based on Cashier, if grouped by Cashier"
 msgstr ""
 
@@ -12420,15 +12623,15 @@
 msgid "Can not filter based on Child Account, if grouped by Account"
 msgstr ""
 
-#: accounts/report/pos_register/pos_register.py:124
+#: accounts/report/pos_register/pos_register.py:120
 msgid "Can not filter based on Customer, if grouped by Customer"
 msgstr ""
 
-#: accounts/report/pos_register/pos_register.py:121
+#: accounts/report/pos_register/pos_register.py:117
 msgid "Can not filter based on POS Profile, if grouped by POS Profile"
 msgstr ""
 
-#: accounts/report/pos_register/pos_register.py:130
+#: accounts/report/pos_register/pos_register.py:126
 msgid "Can not filter based on Payment Method, if grouped by Payment Method"
 msgstr ""
 
@@ -12436,13 +12639,13 @@
 msgid "Can not filter based on Voucher No, if grouped by Voucher"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:1240
-#: accounts/doctype/payment_entry/payment_entry.py:2254
+#: accounts/doctype/journal_entry/journal_entry.py:1242
+#: accounts/doctype/payment_entry/payment_entry.py:2263
 msgid "Can only make payment against unbilled {0}"
 msgstr ""
 
 #: accounts/doctype/payment_entry/payment_entry.js:1438
-#: controllers/accounts_controller.py:2585 public/js/controllers/accounts.js:90
+#: controllers/accounts_controller.py:2560 public/js/controllers/accounts.js:90
 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'"
 msgstr ""
 
@@ -12460,11 +12663,11 @@
 msgid "Cancel At End Of Period"
 msgstr ""
 
-#: support/doctype/warranty_claim/warranty_claim.py:74
+#: support/doctype/warranty_claim/warranty_claim.py:72
 msgid "Cancel Material Visit {0} before cancelling this Warranty Claim"
 msgstr ""
 
-#: maintenance/doctype/maintenance_visit/maintenance_visit.py:188
+#: maintenance/doctype/maintenance_visit/maintenance_visit.py:192
 msgid "Cancel Material Visits {0} before cancelling this Maintenance Visit"
 msgstr ""
 
@@ -12782,12 +12985,12 @@
 msgstr ""
 
 #: stock/doctype/delivery_trip/delivery_trip.js:89
-#: stock/doctype/delivery_trip/delivery_trip.py:189
+#: stock/doctype/delivery_trip/delivery_trip.py:187
 msgid "Cannot Calculate Arrival Time as Driver Address is Missing."
 msgstr ""
 
 #: stock/doctype/item/item.py:598 stock/doctype/item/item.py:611
-#: stock/doctype/item/item.py:629
+#: stock/doctype/item/item.py:625
 msgid "Cannot Merge"
 msgstr ""
 
@@ -12807,35 +13010,35 @@
 msgid "Cannot amend {0} {1}, please create a new one instead."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:273
+#: accounts/doctype/journal_entry/journal_entry.py:270
 msgid "Cannot apply TDS against multiple parties in one entry"
 msgstr ""
 
-#: stock/doctype/item/item.py:307
+#: stock/doctype/item/item.py:306
 msgid "Cannot be a fixed asset item as Stock Ledger is created."
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:217
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:214
 msgid "Cannot cancel as processing of cancelled documents is pending."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:655
+#: manufacturing/doctype/work_order/work_order.py:664
 msgid "Cannot cancel because submitted Stock Entry {0} exists"
 msgstr ""
 
-#: stock/stock_ledger.py:198
+#: stock/stock_ledger.py:197
 msgid "Cannot cancel the transaction. Reposting of item valuation on submission is not completed yet."
 msgstr ""
 
-#: controllers/buying_controller.py:836
+#: controllers/buying_controller.py:839
 msgid "Cannot cancel this document as it is linked with submitted asset {0}. Please cancel it to continue."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:320
+#: stock/doctype/stock_entry/stock_entry.py:317
 msgid "Cannot cancel transaction for Completed Work Order."
 msgstr ""
 
-#: stock/doctype/item/item.py:867
+#: stock/doctype/item/item.py:855
 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item"
 msgstr ""
 
@@ -12843,19 +13046,19 @@
 msgid "Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved."
 msgstr ""
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:70
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:68
 msgid "Cannot change Reference Document Type."
 msgstr ""
 
-#: accounts/deferred_revenue.py:55
+#: accounts/deferred_revenue.py:51
 msgid "Cannot change Service Stop Date for item in row {0}"
 msgstr ""
 
-#: stock/doctype/item/item.py:858
+#: stock/doctype/item/item.py:846
 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this."
 msgstr ""
 
-#: setup/doctype/company/company.py:208
+#: setup/doctype/company/company.py:205
 msgid "Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency."
 msgstr ""
 
@@ -12863,7 +13066,7 @@
 msgid "Cannot complete task {0} as its dependant task {1} are not completed / cancelled."
 msgstr ""
 
-#: accounts/doctype/cost_center/cost_center.py:63
+#: accounts/doctype/cost_center/cost_center.py:61
 msgid "Cannot convert Cost Center to ledger as it has child nodes"
 msgstr ""
 
@@ -12871,15 +13074,15 @@
 msgid "Cannot convert Task to non-group because the following child Tasks exist: {0}."
 msgstr ""
 
-#: accounts/doctype/account/account.py:392
+#: accounts/doctype/account/account.py:388
 msgid "Cannot convert to Group because Account Type is selected."
 msgstr ""
 
-#: accounts/doctype/account/account.py:269
+#: accounts/doctype/account/account.py:265
 msgid "Cannot covert to Group because Account Type is selected."
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:916
+#: stock/doctype/purchase_receipt/purchase_receipt.py:911
 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts."
 msgstr ""
 
@@ -12887,8 +13090,8 @@
 msgid "Cannot create a Delivery Trip from Draft documents."
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:1599
-#: stock/doctype/pick_list/pick_list.py:108
+#: selling/doctype/sales_order/sales_order.py:1587
+#: stock/doctype/pick_list/pick_list.py:107
 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 ""
 
@@ -12896,7 +13099,7 @@
 msgid "Cannot create accounting entries against disabled accounts: {0}"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:949
+#: manufacturing/doctype/bom/bom.py:944
 msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
 msgstr ""
 
@@ -12909,7 +13112,7 @@
 msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'"
 msgstr ""
 
-#: stock/doctype/serial_no/serial_no.py:120
+#: stock/doctype/serial_no/serial_no.py:117
 msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
 msgstr ""
 
@@ -12917,8 +13120,8 @@
 msgid "Cannot enqueue multi docs for one company. {0} is already queued/running for company: {1}"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:644
-#: selling/doctype/sales_order/sales_order.py:667
+#: selling/doctype/sales_order/sales_order.py:650
+#: selling/doctype/sales_order/sales_order.py:673
 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No."
 msgstr ""
 
@@ -12926,27 +13129,27 @@
 msgid "Cannot find Item with this Barcode"
 msgstr ""
 
-#: controllers/accounts_controller.py:3114
+#: controllers/accounts_controller.py:3078
 msgid "Cannot find {} for item {}. Please set the same in Item Master or Stock Settings."
 msgstr ""
 
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:506
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:491
 msgid "Cannot make any transactions until the deletion job is completed"
 msgstr ""
 
-#: controllers/accounts_controller.py:1863
+#: controllers/accounts_controller.py:1853
 msgid "Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:296
+#: manufacturing/doctype/work_order/work_order.py:292
 msgid "Cannot produce more Item {0} than Sales Order quantity {1}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:976
+#: manufacturing/doctype/work_order/work_order.py:973
 msgid "Cannot produce more item for {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:980
+#: manufacturing/doctype/work_order/work_order.py:977
 msgid "Cannot produce more than {0} items for {1}"
 msgstr ""
 
@@ -12955,7 +13158,7 @@
 msgstr ""
 
 #: accounts/doctype/payment_entry/payment_entry.js:1455
-#: controllers/accounts_controller.py:2600
+#: controllers/accounts_controller.py:2575
 #: public/js/controllers/accounts.js:100
 msgid "Cannot refer row number greater than or equal to current row number for this Charge type"
 msgstr ""
@@ -12970,33 +13173,33 @@
 
 #: accounts/doctype/payment_entry/payment_entry.js:1447
 #: accounts/doctype/payment_entry/payment_entry.js:1626
-#: accounts/doctype/payment_entry/payment_entry.py:1598
-#: controllers/accounts_controller.py:2590 public/js/controllers/accounts.js:94
+#: accounts/doctype/payment_entry/payment_entry.py:1618
+#: controllers/accounts_controller.py:2565 public/js/controllers/accounts.js:94
 #: public/js/controllers/taxes_and_totals.js:453
 msgid "Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"
 msgstr ""
 
-#: selling/doctype/quotation/quotation.py:266
+#: selling/doctype/quotation/quotation.py:267
 msgid "Cannot set as Lost as Sales Order is made."
 msgstr ""
 
-#: setup/doctype/authorization_rule/authorization_rule.py:92
+#: setup/doctype/authorization_rule/authorization_rule.py:91
 msgid "Cannot set authorization on basis of Discount for {0}"
 msgstr ""
 
-#: stock/doctype/item/item.py:697
+#: stock/doctype/item/item.py:689
 msgid "Cannot set multiple Item Defaults for a company."
 msgstr ""
 
-#: controllers/accounts_controller.py:3264
+#: controllers/accounts_controller.py:3226
 msgid "Cannot set quantity less than delivered quantity"
 msgstr ""
 
-#: controllers/accounts_controller.py:3269
+#: controllers/accounts_controller.py:3229
 msgid "Cannot set quantity less than received quantity"
 msgstr ""
 
-#: stock/doctype/item_variant_settings/item_variant_settings.py:67
+#: stock/doctype/item_variant_settings/item_variant_settings.py:68
 msgid "Cannot set the field <b>{0}</b> for copying in variants"
 msgstr ""
 
@@ -13020,7 +13223,7 @@
 msgid "Capacity Planning"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:641
+#: manufacturing/doctype/work_order/work_order.py:650
 msgid "Capacity Planning Error, planned start time can not be same as end time"
 msgstr ""
 
@@ -13106,6 +13309,11 @@
 msgid "Capitalized In"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Carat"
+msgstr ""
+
 #. Label of a Data field in DocType 'Shipment'
 #: stock/doctype/shipment/shipment.json
 msgctxt "Shipment"
@@ -13173,15 +13381,15 @@
 msgid "Cash Flow Statement"
 msgstr ""
 
-#: accounts/report/cash_flow/cash_flow.py:146
+#: accounts/report/cash_flow/cash_flow.py:144
 msgid "Cash Flow from Financing"
 msgstr ""
 
-#: accounts/report/cash_flow/cash_flow.py:139
+#: accounts/report/cash_flow/cash_flow.py:137
 msgid "Cash Flow from Investing"
 msgstr ""
 
-#: accounts/report/cash_flow/cash_flow.py:127
+#: accounts/report/cash_flow/cash_flow.py:125
 msgid "Cash Flow from Operations"
 msgstr ""
 
@@ -13213,8 +13421,8 @@
 msgstr ""
 
 #: accounts/report/pos_register/pos_register.js:38
-#: accounts/report/pos_register/pos_register.py:126
-#: accounts/report/pos_register/pos_register.py:200
+#: accounts/report/pos_register/pos_register.py:122
+#: accounts/report/pos_register/pos_register.py:194
 msgid "Cashier"
 msgstr ""
 
@@ -13270,16 +13478,16 @@
 msgid "Category Name"
 msgstr ""
 
-#: assets/dashboard_fixtures.py:94
+#: assets/dashboard_fixtures.py:93
 msgid "Category-wise Asset Value"
 msgstr ""
 
 #: buying/doctype/purchase_order/purchase_order.py:314
-#: buying/doctype/request_for_quotation/request_for_quotation.py:99
+#: buying/doctype/request_for_quotation/request_for_quotation.py:98
 msgid "Caution"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:151
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:150
 msgid "Caution: This might alter frozen accounts."
 msgstr ""
 
@@ -13289,6 +13497,36 @@
 msgid "Cellphone Number"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Celsius"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Cental"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Centiarea"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Centigram/Litre"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Centilitre"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Centimeter"
+msgstr ""
+
 #. Label of a Attach field in DocType 'Asset Maintenance Log'
 #: assets/doctype/asset_maintenance_log/asset_maintenance_log.json
 msgctxt "Asset Maintenance Log"
@@ -13319,6 +13557,11 @@
 msgid "Certificate Required"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Chain"
+msgstr ""
+
 #: selling/page/point_of_sale/pos_payment.js:587
 msgid "Change"
 msgstr ""
@@ -13339,7 +13582,7 @@
 msgid "Change Release Date"
 msgstr ""
 
-#: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:165
+#: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:163
 msgid "Change in Stock Value"
 msgstr ""
 
@@ -13355,7 +13598,7 @@
 msgid "Change in Stock Value"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:902
+#: accounts/doctype/sales_invoice/sales_invoice.py:895
 msgid "Change the account type to Receivable or select a different account."
 msgstr ""
 
@@ -13366,7 +13609,7 @@
 msgid "Change this date manually to setup the next synchronization start date"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:122
+#: selling/doctype/customer/customer.py:121
 msgid "Changed customer name to '{}' as '{}' already exists."
 msgstr ""
 
@@ -13390,8 +13633,8 @@
 msgid "Channel Partner"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1653
-#: controllers/accounts_controller.py:2653
+#: accounts/doctype/payment_entry/payment_entry.py:1673
+#: controllers/accounts_controller.py:2628
 msgid "Charge of type 'Actual' in row {0} cannot be included in Item Rate or Paid Amount"
 msgstr ""
 
@@ -13629,7 +13872,7 @@
 msgid "Cheque Width"
 msgstr ""
 
-#: public/js/controllers/transaction.js:2104
+#: public/js/controllers/transaction.js:2105
 msgid "Cheque/Reference Date"
 msgstr ""
 
@@ -13654,7 +13897,7 @@
 msgid "Cheques Required"
 msgstr ""
 
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:53
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:50
 msgid "Cheques and Deposits incorrectly cleared"
 msgstr ""
 
@@ -13672,7 +13915,7 @@
 msgid "Child nodes can be only created under 'Group' type nodes"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse.py:98
+#: stock/doctype/warehouse/warehouse.py:96
 msgid "Child warehouse exists for this warehouse. You can not delete this warehouse."
 msgstr ""
 
@@ -13744,7 +13987,7 @@
 
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.py:37
 #: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:31
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:101
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:98
 #: templates/form_grid/bank_reconciliation_grid.html:7
 msgid "Clearance Date"
 msgstr ""
@@ -13884,7 +14127,7 @@
 #: stock/doctype/purchase_receipt/purchase_receipt_list.js:17
 #: support/report/issue_analytics/issue_analytics.js:58
 #: support/report/issue_summary/issue_summary.js:46
-#: support/report/issue_summary/issue_summary.py:372
+#: support/report/issue_summary/issue_summary.py:384
 #: templates/pages/task_info.html:76
 msgid "Closed"
 msgstr ""
@@ -13992,11 +14235,11 @@
 msgid "Closed Documents"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:1409
+#: manufacturing/doctype/work_order/work_order.py:1404
 msgid "Closed Work Order can not be stopped or Re-opened"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:423
+#: selling/doctype/sales_order/sales_order.py:431
 msgid "Closed order cannot be cancelled. Unclose to cancel."
 msgstr ""
 
@@ -14006,13 +14249,13 @@
 msgid "Closing"
 msgstr ""
 
-#: accounts/report/trial_balance/trial_balance.py:464
-#: accounts/report/trial_balance_for_party/trial_balance_for_party.py:221
+#: accounts/report/trial_balance/trial_balance.py:458
+#: accounts/report/trial_balance_for_party/trial_balance_for_party.py:213
 msgid "Closing (Cr)"
 msgstr ""
 
-#: accounts/report/trial_balance/trial_balance.py:457
-#: accounts/report/trial_balance_for_party/trial_balance_for_party.py:214
+#: accounts/report/trial_balance/trial_balance.py:451
+#: accounts/report/trial_balance_for_party/trial_balance_for_party.py:206
 msgid "Closing (Dr)"
 msgstr ""
 
@@ -14026,7 +14269,7 @@
 msgid "Closing Account Head"
 msgstr ""
 
-#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:99
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:100
 msgid "Closing Account {0} must be of type Liability / Equity"
 msgstr ""
 
@@ -14036,7 +14279,7 @@
 msgid "Closing Amount"
 msgstr ""
 
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.py:140
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.py:138
 msgid "Closing Balance"
 msgstr ""
 
@@ -14173,7 +14416,7 @@
 msgid "Column {0}"
 msgstr ""
 
-#: accounts/doctype/payment_terms_template/payment_terms_template.py:40
+#: accounts/doctype/payment_terms_template/payment_terms_template.py:39
 msgid "Combined invoice portion must equal 100%"
 msgstr ""
 
@@ -14297,6 +14540,12 @@
 msgid "Commission on Sales"
 msgstr ""
 
+#. Label of a Data field in DocType 'UOM'
+#: setup/doctype/uom/uom.json
+msgctxt "UOM"
+msgid "Common Code"
+msgstr ""
+
 #: setup/setup_wizard/operations/install_fixtures.py:217
 msgid "Communication"
 msgstr ""
@@ -14362,18 +14611,18 @@
 #: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:8
 #: accounts/report/financial_ratios/financial_ratios.js:9
 #: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:8
-#: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:183
+#: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:180
 #: accounts/report/general_ledger/general_ledger.js:8
 #: accounts/report/general_ledger/general_ledger.py:62
 #: accounts/report/gross_profit/gross_profit.js:8
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:40
-#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:227
+#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:231
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:28
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:272
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:277
 #: accounts/report/payment_ledger/payment_ledger.js:8
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:8
 #: accounts/report/pos_register/pos_register.js:8
-#: accounts/report/pos_register/pos_register.py:110
+#: accounts/report/pos_register/pos_register.py:106
 #: accounts/report/profitability_analysis/profitability_analysis.js:8
 #: accounts/report/purchase_register/purchase_register.js:33
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:80
@@ -14390,9 +14639,9 @@
 #: buying/report/procurement_tracker/procurement_tracker.js:8
 #: buying/report/purchase_analytics/purchase_analytics.js:49
 #: buying/report/purchase_order_analysis/purchase_order_analysis.js:8
-#: buying/report/purchase_order_analysis/purchase_order_analysis.py:278
+#: buying/report/purchase_order_analysis/purchase_order_analysis.py:274
 #: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:8
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:268
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:266
 #: buying/report/subcontract_order_summary/subcontract_order_summary.js:7
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:8
 #: crm/report/lead_details/lead_details.js:8
@@ -14450,7 +14699,7 @@
 #: stock/report/delayed_item_report/delayed_item_report.js:8
 #: stock/report/delayed_order_report/delayed_order_report.js:8
 #: stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js:7
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:116
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:114
 #: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:7
 #: stock/report/item_shortage_report/item_shortage_report.js:8
 #: stock/report/item_shortage_report/item_shortage_report.py:137
@@ -14464,14 +14713,14 @@
 #: stock/report/stock_analytics/stock_analytics.js:41
 #: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:7
 #: stock/report/stock_balance/stock_balance.js:8
-#: stock/report/stock_balance/stock_balance.py:474
+#: stock/report/stock_balance/stock_balance.py:473
 #: stock/report/stock_ledger/stock_ledger.js:8
 #: stock/report/stock_ledger/stock_ledger.py:340
 #: stock/report/stock_ledger_variance/stock_ledger_variance.js:18
 #: stock/report/stock_projected_qty/stock_projected_qty.js:8
 #: stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.js:8
 #: stock/report/total_stock_summary/total_stock_summary.js:17
-#: stock/report/total_stock_summary/total_stock_summary.py:30
+#: stock/report/total_stock_summary/total_stock_summary.py:29
 #: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js:8
 #: support/report/issue_analytics/issue_analytics.js:8
 #: support/report/issue_summary/issue_summary.js:8
@@ -15242,7 +15491,7 @@
 msgid "Company Account"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Delivery Note'
+#. Label of a Text Editor field in DocType 'Delivery Note'
 #. Label of a Section Break field in DocType 'Delivery Note'
 #: stock/doctype/delivery_note/delivery_note.json
 msgctxt "Delivery Note"
@@ -15255,7 +15504,7 @@
 msgid "Company Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'POS Invoice'
+#. Label of a Text Editor field in DocType 'POS Invoice'
 #: accounts/doctype/pos_invoice/pos_invoice.json
 msgctxt "POS Invoice"
 msgid "Company Address"
@@ -15267,28 +15516,28 @@
 msgid "Company Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Quotation'
+#. Label of a Text Editor field in DocType 'Quotation'
 #. Label of a Section Break field in DocType 'Quotation'
 #: selling/doctype/quotation/quotation.json
 msgctxt "Quotation"
 msgid "Company Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Sales Invoice'
+#. Label of a Text Editor field in DocType 'Sales Invoice'
 #. Label of a Section Break field in DocType 'Sales Invoice'
 #: accounts/doctype/sales_invoice/sales_invoice.json
 msgctxt "Sales Invoice"
 msgid "Company Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Sales Order'
+#. Label of a Text Editor field in DocType 'Sales Order'
 #. Label of a Section Break field in DocType 'Sales Order'
 #: selling/doctype/sales_order/sales_order.json
 msgctxt "Sales Order"
 msgid "Company Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Dunning'
+#. Label of a Text Editor field in DocType 'Dunning'
 #: accounts/doctype/dunning/dunning.json
 msgctxt "Dunning"
 msgid "Company Address Display"
@@ -15454,16 +15703,16 @@
 msgid "Company Tax ID"
 msgstr ""
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:604
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:605
 msgid "Company and Posting Date is mandatory"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2172
+#: accounts/doctype/sales_invoice/sales_invoice.py:2179
 msgid "Company currencies of both the companies should match for Inter Company Transactions."
 msgstr ""
 
 #: stock/doctype/material_request/material_request.js:326
-#: stock/doctype/stock_entry/stock_entry.js:663
+#: stock/doctype/stock_entry/stock_entry.js:677
 msgid "Company field is required"
 msgstr ""
 
@@ -15471,7 +15720,7 @@
 msgid "Company is mandatory for company account"
 msgstr ""
 
-#: accounts/doctype/subscription/subscription.py:412
+#: accounts/doctype/subscription/subscription.py:404
 msgid "Company is mandatory for generating an invoice. Please set a default company in Global Defaults."
 msgstr ""
 
@@ -15514,11 +15763,11 @@
 msgid "Company {0} already exists. Continuing will overwrite the Company and Chart of Accounts"
 msgstr ""
 
-#: accounts/doctype/account/account.py:462
+#: accounts/doctype/account/account.py:457
 msgid "Company {0} does not exist"
 msgstr ""
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:80
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:78
 msgid "Company {0} is added more than once"
 msgstr ""
 
@@ -15526,7 +15775,7 @@
 msgid "Company {} does not exist yet. Taxes setup aborted."
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.py:449
+#: accounts/doctype/pos_invoice/pos_invoice.py:450
 msgid "Company {} does not match with POS Profile Company {}"
 msgstr ""
 
@@ -15559,7 +15808,7 @@
 msgid "Competitor Name"
 msgstr ""
 
-#: public/js/utils/sales_common.js:476
+#: public/js/utils/sales_common.js:473
 msgid "Competitors"
 msgstr ""
 
@@ -15871,7 +16120,7 @@
 msgid "Completed Qty"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:899
+#: manufacturing/doctype/work_order/work_order.py:902
 msgid "Completed Qty cannot be greater than 'Qty to Manufacture'"
 msgstr ""
 
@@ -16259,15 +16508,15 @@
 msgid "Consumable Cost"
 msgstr ""
 
-#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:62
+#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:60
 msgid "Consumed"
 msgstr ""
 
-#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63
+#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62
 msgid "Consumed Amount"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:324
+#: assets/doctype/asset_capitalization/asset_capitalization.py:330
 msgid "Consumed Asset Items is mandatory for Decapitalization"
 msgstr ""
 
@@ -16298,7 +16547,7 @@
 #: buying/report/subcontract_order_summary/subcontract_order_summary.py:153
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:59
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:136
-#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62
+#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61
 msgid "Consumed Qty"
 msgstr ""
 
@@ -16338,7 +16587,7 @@
 msgid "Consumed Stock Items"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:327
+#: assets/doctype/asset_capitalization/asset_capitalization.py:333
 msgid "Consumed Stock Items or Consumed Asset Items is mandatory for Capitalization"
 msgstr ""
 
@@ -16874,7 +17123,7 @@
 msgstr ""
 
 #: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:157
-#: public/js/controllers/transaction.js:2117
+#: public/js/controllers/transaction.js:2118
 #: selling/doctype/quotation/quotation.js:356
 msgid "Continue"
 msgstr ""
@@ -16998,7 +17247,7 @@
 msgid "Control Historical Stock Transactions"
 msgstr ""
 
-#: public/js/utils.js:749
+#: public/js/utils.js:747
 msgid "Conversion Factor"
 msgstr ""
 
@@ -17120,11 +17369,11 @@
 msgid "Conversion Rate"
 msgstr ""
 
-#: stock/doctype/item/item.py:387
+#: stock/doctype/item/item.py:386
 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:2476
+#: controllers/accounts_controller.py:2453
 msgid "Conversion rate cannot be 0 or 1"
 msgstr ""
 
@@ -17139,7 +17388,7 @@
 msgid "Convert to Group"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse.js:58
+#: stock/doctype/warehouse/warehouse.js:59
 msgctxt "Warehouse"
 msgid "Convert to Group"
 msgstr ""
@@ -17148,7 +17397,7 @@
 msgid "Convert to Item Based Reposting"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse.js:57
+#: stock/doctype/warehouse/warehouse.js:58
 msgctxt "Warehouse"
 msgid "Convert to Ledger"
 msgstr ""
@@ -17242,20 +17491,20 @@
 #: accounts/report/accounts_payable/accounts_payable.js:28
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:62
 #: accounts/report/accounts_receivable/accounts_receivable.js:30
-#: accounts/report/accounts_receivable/accounts_receivable.py:1055
+#: accounts/report/accounts_receivable/accounts_receivable.py:1045
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:62
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:42
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:181
 #: accounts/report/general_ledger/general_ledger.js:152
-#: accounts/report/general_ledger/general_ledger.py:656
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:300
+#: accounts/report/general_ledger/general_ledger.py:647
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:305
 #: accounts/report/purchase_register/purchase_register.js:46
 #: accounts/report/sales_payment_summary/sales_payment_summary.py:29
 #: accounts/report/sales_register/sales_register.js:52
-#: accounts/report/sales_register/sales_register.py:250
+#: accounts/report/sales_register/sales_register.py:251
 #: accounts/report/trial_balance/trial_balance.js:49
 #: assets/report/fixed_asset_register/fixed_asset_register.js:29
-#: assets/report/fixed_asset_register/fixed_asset_register.py:461
+#: assets/report/fixed_asset_register/fixed_asset_register.py:451
 #: buying/report/procurement_tracker/procurement_tracker.js:15
 #: buying/report/procurement_tracker/procurement_tracker.py:32
 #: public/js/financial_statements.js:246
@@ -17634,7 +17883,7 @@
 msgid "Cost Center Allocation Percentages"
 msgstr ""
 
-#: public/js/utils/sales_common.js:435
+#: public/js/utils/sales_common.js:432
 msgid "Cost Center For Item with Item Code {0} has been Changed to {1}"
 msgstr ""
 
@@ -17659,40 +17908,40 @@
 msgid "Cost Center and Budgeting"
 msgstr ""
 
-#: accounts/doctype/cost_center/cost_center.py:77
+#: accounts/doctype/cost_center/cost_center.py:75
 msgid "Cost Center is a part of Cost Center Allocation, hence cannot be converted to a group"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1287
-#: stock/doctype/purchase_receipt/purchase_receipt.py:790
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1292
+#: stock/doctype/purchase_receipt/purchase_receipt.py:785
 msgid "Cost Center is required in row {0} in Taxes table for type {1}"
 msgstr ""
 
-#: accounts/doctype/cost_center/cost_center.py:74
+#: accounts/doctype/cost_center/cost_center.py:72
 msgid "Cost Center with Allocation records can not be converted to a group"
 msgstr ""
 
-#: accounts/doctype/cost_center/cost_center.py:80
+#: accounts/doctype/cost_center/cost_center.py:78
 msgid "Cost Center with existing transactions can not be converted to group"
 msgstr ""
 
-#: accounts/doctype/cost_center/cost_center.py:65
+#: accounts/doctype/cost_center/cost_center.py:63
 msgid "Cost Center with existing transactions can not be converted to ledger"
 msgstr ""
 
-#: accounts/doctype/cost_center_allocation/cost_center_allocation.py:154
+#: accounts/doctype/cost_center_allocation/cost_center_allocation.py:152
 msgid "Cost Center {0} cannot be used for allocation as it is used as main cost center in other allocation record."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:248
+#: assets/doctype/asset/asset.py:246
 msgid "Cost Center {} doesn't belong to Company {}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:255
+#: assets/doctype/asset/asset.py:253
 msgid "Cost Center {} is a group cost center and group cost centers cannot be used in transactions"
 msgstr ""
 
-#: accounts/report/financial_statements.py:612
+#: accounts/report/financial_statements.py:611
 msgid "Cost Center: {0} does not exist"
 msgstr ""
 
@@ -17717,8 +17966,8 @@
 msgid "Cost Per Unit"
 msgstr ""
 
-#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:375
-#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:399
+#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:367
+#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:391
 msgid "Cost as on"
 msgstr ""
 
@@ -17742,7 +17991,7 @@
 msgid "Cost of Issued Items"
 msgstr ""
 
-#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:381
+#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:373
 msgid "Cost of New Purchase"
 msgstr ""
 
@@ -17755,11 +18004,11 @@
 msgid "Cost of Purchased Items"
 msgstr ""
 
-#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:393
+#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:385
 msgid "Cost of Scrapped Asset"
 msgstr ""
 
-#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:387
+#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:379
 msgid "Cost of Sold Asset"
 msgstr ""
 
@@ -17831,20 +18080,20 @@
 msgid "Could Not Delete Demo Data"
 msgstr ""
 
-#: selling/doctype/quotation/quotation.py:551
+#: selling/doctype/quotation/quotation.py:547
 msgid "Could not auto create Customer due to the following missing mandatory field(s):"
 msgstr ""
 
-#: assets/doctype/asset_shift_allocation/asset_shift_allocation.py:165
-#: assets/doctype/asset_shift_allocation/asset_shift_allocation.py:225
+#: assets/doctype/asset_shift_allocation/asset_shift_allocation.py:160
+#: assets/doctype/asset_shift_allocation/asset_shift_allocation.py:220
 msgid "Could not auto update shifts. Shift with shift factor {0} needed."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:798
+#: stock/doctype/delivery_note/delivery_note.py:813
 msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:355
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:353
 msgid "Could not detect the Company for updating Bank Accounts"
 msgstr ""
 
@@ -17853,19 +18102,24 @@
 msgid "Could not find path for "
 msgstr ""
 
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py:128
-#: accounts/report/financial_statements.py:236
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py:124
+#: accounts/report/financial_statements.py:234
 msgid "Could not retrieve information for {0}."
 msgstr ""
 
-#: buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py:78
+#: buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py:80
 msgid "Could not solve criteria score function for {0}. Make sure the formula is valid."
 msgstr ""
 
-#: buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py:98
+#: buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py:100
 msgid "Could not solve weighted score function. Make sure the formula is valid."
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Coulomb"
+msgstr ""
+
 #. Label of a Int field in DocType 'Shipment Parcel'
 #: stock/doctype/shipment_parcel/shipment_parcel.json
 msgctxt "Shipment Parcel"
@@ -17937,7 +18191,7 @@
 msgid "Country"
 msgstr ""
 
-#: regional/doctype/import_supplier_invoice/import_supplier_invoice.py:422
+#: regional/doctype/import_supplier_invoice/import_supplier_invoice.py:421
 msgid "Country Code in File does not match with country code set up in the system"
 msgstr ""
 
@@ -18041,13 +18295,13 @@
 #: accounts/doctype/sales_invoice/sales_invoice.js:179
 #: accounts/doctype/sales_invoice/sales_invoice.js:205
 #: buying/doctype/purchase_order/purchase_order.js:99
-#: buying/doctype/purchase_order/purchase_order.js:354
-#: buying/doctype/purchase_order/purchase_order.js:371
-#: buying/doctype/purchase_order/purchase_order.js:380
-#: buying/doctype/purchase_order/purchase_order.js:387
-#: buying/doctype/purchase_order/purchase_order.js:397
-#: buying/doctype/purchase_order/purchase_order.js:415
+#: buying/doctype/purchase_order/purchase_order.js:356
+#: buying/doctype/purchase_order/purchase_order.js:375
+#: buying/doctype/purchase_order/purchase_order.js:386
+#: buying/doctype/purchase_order/purchase_order.js:393
+#: buying/doctype/purchase_order/purchase_order.js:403
 #: buying/doctype/purchase_order/purchase_order.js:421
+#: buying/doctype/purchase_order/purchase_order.js:427
 #: buying/doctype/request_for_quotation/request_for_quotation.js:49
 #: buying/doctype/request_for_quotation/request_for_quotation.js:156
 #: buying/doctype/request_for_quotation/request_for_quotation.js:187
@@ -18082,7 +18336,7 @@
 #: public/js/communication.js:31 public/js/communication.js:41
 #: public/js/controllers/transaction.js:326
 #: public/js/controllers/transaction.js:327
-#: public/js/controllers/transaction.js:2231
+#: public/js/controllers/transaction.js:2232
 #: selling/doctype/customer/customer.js:176
 #: selling/doctype/quotation/quotation.js:125
 #: selling/doctype/quotation/quotation.js:134
@@ -18139,7 +18393,7 @@
 #: stock/doctype/stock_entry/stock_entry.js:162
 #: stock/doctype/stock_entry/stock_entry.js:164
 #: stock/doctype/stock_entry/stock_entry.js:237
-#: stock/doctype/stock_entry/stock_entry.js:1220
+#: stock/doctype/stock_entry/stock_entry.js:1236
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.js:169
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.js:202
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.js:212
@@ -18172,15 +18426,15 @@
 msgid "Create Document"
 msgstr ""
 
-#: utilities/activation.py:138
+#: utilities/activation.py:136
 msgid "Create Employee"
 msgstr ""
 
-#: utilities/activation.py:136
+#: utilities/activation.py:134
 msgid "Create Employee Records"
 msgstr ""
 
-#: utilities/activation.py:137
+#: utilities/activation.py:135
 msgid "Create Employee records."
 msgstr ""
 
@@ -18213,11 +18467,11 @@
 msgstr ""
 
 #. Title of an Onboarding Step
-#: crm/onboarding_step/create_lead/create_lead.json utilities/activation.py:80
+#: crm/onboarding_step/create_lead/create_lead.json utilities/activation.py:78
 msgid "Create Lead"
 msgstr ""
 
-#: utilities/activation.py:78
+#: utilities/activation.py:76
 msgid "Create Leads"
 msgstr ""
 
@@ -18284,15 +18538,15 @@
 msgid "Create Prospect"
 msgstr ""
 
-#: utilities/activation.py:107
+#: utilities/activation.py:105
 msgid "Create Purchase Order"
 msgstr ""
 
-#: utilities/activation.py:105
+#: utilities/activation.py:103
 msgid "Create Purchase Orders"
 msgstr ""
 
-#: utilities/activation.py:89
+#: utilities/activation.py:87
 msgid "Create Quotation"
 msgstr ""
 
@@ -18324,11 +18578,11 @@
 
 #. Label of an action in the Onboarding Step 'Create a Sales Order'
 #: selling/onboarding_step/create_a_sales_order/create_a_sales_order.json
-#: utilities/activation.py:98
+#: utilities/activation.py:96
 msgid "Create Sales Order"
 msgstr ""
 
-#: utilities/activation.py:97
+#: utilities/activation.py:95
 msgid "Create Sales Orders to help you plan your work and deliver on-time"
 msgstr ""
 
@@ -18353,11 +18607,11 @@
 msgid "Create Tax Template"
 msgstr ""
 
-#: utilities/activation.py:129
+#: utilities/activation.py:127
 msgid "Create Timesheet"
 msgstr ""
 
-#: utilities/activation.py:118
+#: utilities/activation.py:116
 msgid "Create User"
 msgstr ""
 
@@ -18373,7 +18627,7 @@
 msgid "Create User Permission"
 msgstr ""
 
-#: utilities/activation.py:114
+#: utilities/activation.py:112
 msgid "Create Users"
 msgstr ""
 
@@ -18488,7 +18742,7 @@
 msgid "Create an Item"
 msgstr ""
 
-#: stock/stock_ledger.py:1704
+#: stock/stock_ledger.py:1676
 msgid "Create an incoming stock transaction for the Item."
 msgstr ""
 
@@ -18497,7 +18751,7 @@
 msgid "Create and Send Quotation"
 msgstr ""
 
-#: utilities/activation.py:87
+#: utilities/activation.py:85
 msgid "Create customer quotes"
 msgstr ""
 
@@ -18541,7 +18795,7 @@
 msgid "Created On"
 msgstr ""
 
-#: buying/doctype/supplier_scorecard/supplier_scorecard.py:248
+#: buying/doctype/supplier_scorecard/supplier_scorecard.py:250
 msgid "Created {0} scorecards for {1} between:"
 msgstr ""
 
@@ -18549,7 +18803,7 @@
 msgid "Creating Accounts..."
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.py:398
+#: erpnext_integrations/doctype/tally_migration/tally_migration.py:404
 msgid "Creating Company and Importing Chart of Accounts"
 msgstr ""
 
@@ -18557,7 +18811,7 @@
 msgid "Creating Delivery Note ..."
 msgstr ""
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:143
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:140
 msgid "Creating Dimensions..."
 msgstr ""
 
@@ -18570,7 +18824,7 @@
 msgstr ""
 
 #: accounts/doctype/purchase_invoice/purchase_invoice.js:709
-#: buying/doctype/purchase_order/purchase_order.js:482
+#: buying/doctype/purchase_order/purchase_order.js:488
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:71
 msgid "Creating Purchase Receipt ..."
 msgstr ""
@@ -18580,7 +18834,7 @@
 msgid "Creating Stock Entry"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:497
+#: buying/doctype/purchase_order/purchase_order.js:503
 msgid "Creating Subcontracting Order ..."
 msgstr ""
 
@@ -18600,7 +18854,7 @@
 msgid "Creating {} out of {} {}"
 msgstr ""
 
-#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:142
+#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:141
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:131
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:44
 msgid "Creation"
@@ -18612,17 +18866,17 @@
 msgid "Creation Document No"
 msgstr ""
 
-#: utilities/bulk_transaction.py:185
+#: utilities/bulk_transaction.py:181
 msgid "Creation of <b><a href='/app/{0}'>{1}(s)</a></b> successful"
 msgstr ""
 
-#: utilities/bulk_transaction.py:202
+#: utilities/bulk_transaction.py:198
 msgid ""
 "Creation of {0} failed.\n"
 "\t\t\t\tCheck <b><a href=\"/app/bulk-transaction-log\">Bulk Transaction Log</a></b>"
 msgstr ""
 
-#: utilities/bulk_transaction.py:193
+#: utilities/bulk_transaction.py:189
 msgid ""
 "Creation of {0} partially successful.\n"
 "\t\t\t\tCheck <b><a href=\"/app/bulk-transaction-log\">Bulk Transaction Log</a></b>"
@@ -18630,13 +18884,13 @@
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:40
 #: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:14
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:87
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:84
 #: accounts/report/general_ledger/general_ledger.html:31
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:115
 #: accounts/report/purchase_register/purchase_register.py:241
-#: accounts/report/sales_register/sales_register.py:275
-#: accounts/report/trial_balance/trial_balance.py:450
-#: accounts/report/trial_balance_for_party/trial_balance_for_party.py:207
+#: accounts/report/sales_register/sales_register.py:276
+#: accounts/report/trial_balance/trial_balance.py:444
+#: accounts/report/trial_balance_for_party/trial_balance_for_party.py:199
 #: accounts/report/voucher_wise_balance/voucher_wise_balance.py:34
 msgid "Credit"
 msgstr ""
@@ -18653,15 +18907,15 @@
 msgid "Credit"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:614
+#: accounts/report/general_ledger/general_ledger.py:605
 msgid "Credit (Transaction)"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:591
+#: accounts/report/general_ledger/general_ledger.py:582
 msgid "Credit ({0})"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:593
+#: accounts/doctype/journal_entry/journal_entry.js:596
 msgid "Credit Account"
 msgstr ""
 
@@ -18764,7 +19018,7 @@
 msgid "Credit Limit"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:558
+#: selling/doctype/customer/customer.py:553
 msgid "Credit Limit Crossed"
 msgstr ""
 
@@ -18806,8 +19060,8 @@
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:173
 #: accounts/report/accounts_receivable/accounts_receivable.html:147
-#: accounts/report/accounts_receivable/accounts_receivable.py:1078
-#: controllers/sales_and_purchase_return.py:328
+#: accounts/report/accounts_receivable/accounts_receivable.py:1068
+#: controllers/sales_and_purchase_return.py:322
 #: setup/setup_wizard/operations/install_fixtures.py:256
 #: stock/doctype/delivery_note/delivery_note.js:84
 msgid "Credit Note"
@@ -18860,7 +19114,7 @@
 msgid "Credit Note will update it's own outstanding amount, even if \"Return Against\" is specified."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:795
+#: stock/doctype/delivery_note/delivery_note.py:810
 msgid "Credit Note {0} has been created automatically"
 msgstr ""
 
@@ -18876,16 +19130,16 @@
 msgid "Credit in Company Currency"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:524
-#: selling/doctype/customer/customer.py:579
+#: selling/doctype/customer/customer.py:519
+#: selling/doctype/customer/customer.py:574
 msgid "Credit limit has been crossed for customer {0} ({1}/{2})"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:340
+#: selling/doctype/customer/customer.py:337
 msgid "Credit limit is already defined for the Company {0}"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:578
+#: selling/doctype/customer/customer.py:573
 msgid "Credit limit reached for customer {0}"
 msgstr ""
 
@@ -18949,8 +19203,8 @@
 msgid "Criteria Weight"
 msgstr ""
 
-#: buying/doctype/supplier_scorecard/supplier_scorecard.py:86
-#: buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py:56
+#: buying/doctype/supplier_scorecard/supplier_scorecard.py:89
+#: buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py:55
 msgid "Criteria weights must add up to 100%"
 msgstr ""
 
@@ -18959,34 +19213,74 @@
 msgid "Cross Listing of Item in multiple groups"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Cubic Centimeter"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Cubic Decimeter"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Cubic Foot"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Cubic Inch"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Cubic Meter"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Cubic Millimeter"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Cubic Yard"
+msgstr ""
+
 #. Label of a Float field in DocType 'Tax Withholding Rate'
 #: accounts/doctype/tax_withholding_rate/tax_withholding_rate.json
 msgctxt "Tax Withholding Rate"
 msgid "Cumulative Transaction Threshold"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Cup"
+msgstr ""
+
 #: accounts/doctype/account/account_tree.js:166
 #: accounts/report/account_balance/account_balance.py:28
-#: accounts/report/accounts_receivable/accounts_receivable.py:1087
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:208
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:104
+#: accounts/report/accounts_receivable/accounts_receivable.py:1077
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:206
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:101
 #: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:118
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:298
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.py:147
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py:212
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:292
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.py:145
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py:208
 #: accounts/report/financial_statements.html:29
-#: accounts/report/financial_statements.py:631
+#: accounts/report/financial_statements.py:630
 #: accounts/report/general_ledger/general_ledger.js:146
-#: accounts/report/gross_profit/gross_profit.py:363
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:650
+#: accounts/report/gross_profit/gross_profit.py:361
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:646
 #: accounts/report/payment_ledger/payment_ledger.py:213
 #: accounts/report/profitability_analysis/profitability_analysis.py:175
 #: accounts/report/purchase_register/purchase_register.py:229
-#: accounts/report/sales_register/sales_register.py:263
+#: accounts/report/sales_register/sales_register.py:264
 #: accounts/report/trial_balance/trial_balance.js:76
-#: accounts/report/trial_balance/trial_balance.py:422
-#: accounts/report/trial_balance_for_party/trial_balance_for_party.py:228
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:218
+#: accounts/report/trial_balance/trial_balance.py:416
+#: accounts/report/trial_balance_for_party/trial_balance_for_party.py:220
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:214
 #: manufacturing/doctype/bom_creator/bom_creator.js:76
 #: public/js/financial_statements.js:240 public/js/utils/unreconcile.js:93
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:121
@@ -19280,20 +19574,20 @@
 msgid "Currency and Price List"
 msgstr ""
 
-#: accounts/doctype/account/account.py:314
+#: accounts/doctype/account/account.py:310
 msgid "Currency can not be changed after making entries using some other currency"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1379
-#: accounts/doctype/payment_entry/payment_entry.py:1441 accounts/utils.py:2059
+#: accounts/doctype/payment_entry/payment_entry.py:1399
+#: accounts/doctype/payment_entry/payment_entry.py:1461 accounts/utils.py:2017
 msgid "Currency for {0} must be {1}"
 msgstr ""
 
-#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:105
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:106
 msgid "Currency of the Closing Account must be {0}"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:575
+#: manufacturing/doctype/bom/bom.py:570
 msgid "Currency of the price list {0} must be {1} or {2}"
 msgstr ""
 
@@ -19354,7 +19648,7 @@
 msgid "Current BOM"
 msgstr ""
 
-#: manufacturing/doctype/bom_update_log/bom_update_log.py:79
+#: manufacturing/doctype/bom_update_log/bom_update_log.py:77
 msgid "Current BOM and New BOM can not be same"
 msgstr ""
 
@@ -19405,7 +19699,7 @@
 msgid "Current Node"
 msgstr ""
 
-#: stock/report/total_stock_summary/total_stock_summary.py:24
+#: stock/report/total_stock_summary/total_stock_summary.py:23
 msgid "Current Qty"
 msgstr ""
 
@@ -19501,15 +19795,15 @@
 #: accounts/doctype/sales_invoice/sales_invoice.js:296
 #: accounts/report/customer_ledger_summary/customer_ledger_summary.js:37
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:28
-#: accounts/report/gross_profit/gross_profit.py:321
+#: accounts/report/gross_profit/gross_profit.py:319
 #: accounts/report/inactive_sales_items/inactive_sales_items.py:37
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:22
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:221
 #: accounts/report/pos_register/pos_register.js:44
-#: accounts/report/pos_register/pos_register.py:123
-#: accounts/report/pos_register/pos_register.py:186
+#: accounts/report/pos_register/pos_register.py:119
+#: accounts/report/pos_register/pos_register.py:180
 #: accounts/report/sales_register/sales_register.js:21
-#: accounts/report/sales_register/sales_register.py:185
+#: accounts/report/sales_register/sales_register.py:186
 #: buying/doctype/supplier/supplier.js:192 crm/doctype/lead/lead.js:31
 #: crm/doctype/opportunity/opportunity.js:99 crm/doctype/prospect/prospect.js:8
 #: crm/report/lead_conversion_time/lead_conversion_time.py:54
@@ -19523,7 +19817,7 @@
 #: selling/report/customer_credit_balance/customer_credit_balance.js:16
 #: selling/report/customer_credit_balance/customer_credit_balance.py:64
 #: selling/report/customer_wise_item_price/customer_wise_item_price.js:7
-#: selling/report/inactive_customers/inactive_customers.py:78
+#: selling/report/inactive_customers/inactive_customers.py:74
 #: selling/report/item_wise_sales_history/item_wise_sales_history.js:47
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:72
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:37
@@ -19917,7 +20211,7 @@
 msgid "Customer Code"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1035
+#: accounts/report/accounts_receivable/accounts_receivable.py:1025
 msgid "Customer Contact"
 msgstr ""
 
@@ -19998,17 +20292,17 @@
 
 #. Name of a DocType
 #: accounts/report/accounts_receivable/accounts_receivable.js:121
-#: accounts/report/accounts_receivable/accounts_receivable.py:1105
+#: accounts/report/accounts_receivable/accounts_receivable.py:1095
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:102
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:188
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:186
 #: accounts/report/customer_ledger_summary/customer_ledger_summary.js:55
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.py:166
-#: accounts/report/gross_profit/gross_profit.py:328
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.py:164
+#: accounts/report/gross_profit/gross_profit.py:326
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:208
 #: accounts/report/sales_register/sales_register.js:27
-#: accounts/report/sales_register/sales_register.py:200
+#: accounts/report/sales_register/sales_register.py:201
 #: public/js/sales_trends_filters.js:26
-#: selling/report/inactive_customers/inactive_customers.py:81
+#: selling/report/inactive_customers/inactive_customers.py:77
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:80
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:30
 #: setup/doctype/customer_group/customer_group.json
@@ -20176,7 +20470,7 @@
 msgid "Customer Group Name"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1205
+#: accounts/report/accounts_receivable/accounts_receivable.py:1195
 msgid "Customer Group: {0} does not exist"
 msgstr ""
 
@@ -20197,7 +20491,7 @@
 msgid "Customer Items"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1096
+#: accounts/report/accounts_receivable/accounts_receivable.py:1086
 msgid "Customer LPO"
 msgstr ""
 
@@ -20219,14 +20513,14 @@
 msgid "Customer Mobile No"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1042
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:160
+#: accounts/report/accounts_receivable/accounts_receivable.py:1032
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:158
 #: accounts/report/customer_ledger_summary/customer_ledger_summary.js:91
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:34
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:227
-#: accounts/report/sales_register/sales_register.py:191
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:228
+#: accounts/report/sales_register/sales_register.py:192
 #: selling/report/customer_credit_balance/customer_credit_balance.py:74
-#: selling/report/inactive_customers/inactive_customers.py:79
+#: selling/report/inactive_customers/inactive_customers.py:75
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:78
 msgid "Customer Name"
 msgstr ""
@@ -20420,7 +20714,7 @@
 msgid "Customer Provided"
 msgstr ""
 
-#: setup/doctype/company/company.py:358
+#: setup/doctype/company/company.py:350
 msgid "Customer Service"
 msgstr ""
 
@@ -20452,12 +20746,12 @@
 msgid "Customer contact updated successfully."
 msgstr ""
 
-#: support/doctype/warranty_claim/warranty_claim.py:56
+#: support/doctype/warranty_claim/warranty_claim.py:54
 msgid "Customer is required"
 msgstr ""
 
-#: accounts/doctype/loyalty_program/loyalty_program.py:120
-#: accounts/doctype/loyalty_program/loyalty_program.py:142
+#: accounts/doctype/loyalty_program/loyalty_program.py:116
+#: accounts/doctype/loyalty_program/loyalty_program.py:138
 msgid "Customer isn't enrolled in any Loyalty Program"
 msgstr ""
 
@@ -20467,13 +20761,13 @@
 msgid "Customer or Item"
 msgstr ""
 
-#: setup/doctype/authorization_rule/authorization_rule.py:97
+#: setup/doctype/authorization_rule/authorization_rule.py:95
 msgid "Customer required for 'Customerwise Discount'"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1003
-#: selling/doctype/sales_order/sales_order.py:338
-#: stock/doctype/delivery_note/delivery_note.py:408
+#: accounts/doctype/sales_invoice/sales_invoice.py:1007
+#: selling/doctype/sales_order/sales_order.py:343
+#: stock/doctype/delivery_note/delivery_note.py:418
 msgid "Customer {0} does not belong to project {1}"
 msgstr ""
 
@@ -20583,7 +20877,7 @@
 msgid "Customers Without Any Sales Transactions"
 msgstr ""
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:97
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:95
 msgid "Customers not selected."
 msgstr ""
 
@@ -20610,7 +20904,12 @@
 msgid "Customs Tariff Number"
 msgstr ""
 
-#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:205
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Cycle/Second"
+msgstr ""
+
+#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:204
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:220
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:144
 msgid "D - E"
@@ -20689,7 +20988,7 @@
 msgid "Daily Project Summary for {0}"
 msgstr ""
 
-#: setup/doctype/email_digest/email_digest.py:183
+#: setup/doctype/email_digest/email_digest.py:181
 msgid "Daily Reminders"
 msgstr ""
 
@@ -20765,7 +21064,7 @@
 msgid "Data exported from Tally that consists of the Chart of Accounts, Customers, Suppliers, Addresses, Items and UOMs"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:603
+#: accounts/doctype/journal_entry/journal_entry.js:606
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:36
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:150
 #: accounts/report/account_balance/account_balance.js:15
@@ -20779,8 +21078,8 @@
 #: accounts/report/share_balance/share_balance.js:9
 #: accounts/report/share_ledger/share_ledger.js:9
 #: accounts/report/share_ledger/share_ledger.py:52
-#: buying/report/purchase_order_analysis/purchase_order_analysis.py:164
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:192
+#: buying/report/purchase_order_analysis/purchase_order_analysis.py:160
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:190
 #: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:28
 #: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.py:28
 #: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.py:11
@@ -20987,7 +21286,7 @@
 msgstr ""
 
 #: maintenance/doctype/maintenance_visit/maintenance_visit.py:72
-#: maintenance/doctype/maintenance_visit/maintenance_visit.py:88
+#: maintenance/doctype/maintenance_visit/maintenance_visit.py:92
 msgid "Date must be between {0} and {1}"
 msgstr ""
 
@@ -21035,7 +21334,7 @@
 msgid "Date of Joining"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:265
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:263
 msgid "Date of Transaction"
 msgstr ""
 
@@ -21043,6 +21342,11 @@
 msgid "Date: "
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Day"
+msgstr ""
+
 #. Option for the 'Billing Interval' (Select) field in DocType 'Subscription
 #. Plan'
 #: accounts/doctype/subscription_plan/subscription_plan.json
@@ -21136,7 +21440,7 @@
 
 #: accounts/report/inactive_sales_items/inactive_sales_items.py:51
 #: selling/report/inactive_customers/inactive_customers.js:8
-#: selling/report/inactive_customers/inactive_customers.py:87
+#: selling/report/inactive_customers/inactive_customers.py:83
 msgid "Days Since Last Order"
 msgstr ""
 
@@ -21173,19 +21477,19 @@
 msgid "Dear"
 msgstr ""
 
-#: stock/reorder_item.py:370
+#: stock/reorder_item.py:369
 msgid "Dear System Manager,"
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:39
 #: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:13
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:80
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:77
 #: accounts/report/general_ledger/general_ledger.html:30
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:114
 #: accounts/report/purchase_register/purchase_register.py:240
-#: accounts/report/sales_register/sales_register.py:274
-#: accounts/report/trial_balance/trial_balance.py:443
-#: accounts/report/trial_balance_for_party/trial_balance_for_party.py:200
+#: accounts/report/sales_register/sales_register.py:275
+#: accounts/report/trial_balance/trial_balance.py:437
+#: accounts/report/trial_balance_for_party/trial_balance_for_party.py:192
 #: accounts/report/voucher_wise_balance/voucher_wise_balance.py:27
 msgid "Debit"
 msgstr ""
@@ -21202,15 +21506,15 @@
 msgid "Debit"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:607
+#: accounts/report/general_ledger/general_ledger.py:598
 msgid "Debit (Transaction)"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:585
+#: accounts/report/general_ledger/general_ledger.py:576
 msgid "Debit ({0})"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:583
+#: accounts/doctype/journal_entry/journal_entry.js:586
 msgid "Debit Account"
 msgstr ""
 
@@ -21246,8 +21550,8 @@
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:175
 #: accounts/report/accounts_receivable/accounts_receivable.html:147
-#: accounts/report/accounts_receivable/accounts_receivable.py:1081
-#: controllers/sales_and_purchase_return.py:332
+#: accounts/report/accounts_receivable/accounts_receivable.py:1071
+#: controllers/sales_and_purchase_return.py:326
 #: setup/setup_wizard/operations/install_fixtures.py:257
 #: stock/doctype/purchase_receipt/purchase_receipt.js:76
 msgid "Debit Note"
@@ -21296,11 +21600,11 @@
 msgid "Debit To"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:884
+#: accounts/doctype/sales_invoice/sales_invoice.py:876
 msgid "Debit To is required"
 msgstr ""
 
-#: accounts/general_ledger.py:474
+#: accounts/general_ledger.py:468
 msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
 msgstr ""
 
@@ -21340,7 +21644,22 @@
 msgid "Decapitalized"
 msgstr ""
 
-#: public/js/utils/sales_common.js:503
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Decigram/Litre"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Decilitre"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Decimeter"
+msgstr ""
+
+#: public/js/utils/sales_common.js:500
 msgid "Declare Lost"
 msgstr ""
 
@@ -21468,19 +21787,19 @@
 msgid "Default BOM"
 msgstr ""
 
-#: stock/doctype/item/item.py:412
+#: stock/doctype/item/item.py:411
 msgid "Default BOM ({0}) must be active for this item or its template"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:1248
+#: manufacturing/doctype/work_order/work_order.py:1245
 msgid "Default BOM for {0} not found"
 msgstr ""
 
-#: controllers/accounts_controller.py:3307
+#: controllers/accounts_controller.py:3267
 msgid "Default BOM not found for FG Item {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:1245
+#: manufacturing/doctype/work_order/work_order.py:1242
 msgid "Default BOM not found for Item {0} and Project {1}"
 msgstr ""
 
@@ -21874,7 +22193,7 @@
 msgid "Default Service Level Agreement"
 msgstr ""
 
-#: support/doctype/service_level_agreement/service_level_agreement.py:157
+#: support/doctype/service_level_agreement/service_level_agreement.py:161
 msgid "Default Service Level Agreement for {0} already exists."
 msgstr ""
 
@@ -21938,15 +22257,15 @@
 msgid "Default Unit of Measure"
 msgstr ""
 
-#: stock/doctype/item/item.py:1234
+#: stock/doctype/item/item.py:1218
 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item."
 msgstr ""
 
-#: stock/doctype/item/item.py:1217
+#: stock/doctype/item/item.py:1201
 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM."
 msgstr ""
 
-#: stock/doctype/item/item.py:889
+#: stock/doctype/item/item.py:877
 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'"
 msgstr ""
 
@@ -22158,7 +22477,7 @@
 msgid "Deferred Revenue and Expense"
 msgstr ""
 
-#: accounts/deferred_revenue.py:569
+#: accounts/deferred_revenue.py:541
 msgid "Deferred accounting failed for some invoices:"
 msgstr ""
 
@@ -22171,6 +22490,11 @@
 msgid "Define Project type."
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Dekagram/Litre"
+msgstr ""
+
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:108
 msgid "Delay (In Days)"
 msgstr ""
@@ -22267,7 +22591,7 @@
 msgid "Deleted Documents"
 msgstr ""
 
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:489
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:479
 msgid "Deletion in Progress!"
 msgstr ""
 
@@ -22277,8 +22601,8 @@
 
 #: buying/doctype/purchase_order/purchase_order.js:335
 #: buying/doctype/purchase_order/purchase_order_list.js:19
-#: controllers/website_list_for_contact.py:211
-#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:63
+#: controllers/website_list_for_contact.py:209
+#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:61
 msgid "Delivered"
 msgstr ""
 
@@ -22306,7 +22630,7 @@
 msgid "Delivered"
 msgstr ""
 
-#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65
+#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64
 msgid "Delivered Amount"
 msgstr ""
 
@@ -22331,7 +22655,7 @@
 
 #: selling/report/sales_order_analysis/sales_order_analysis.py:262
 #: stock/report/reserved_stock/reserved_stock.py:131
-#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64
+#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63
 msgid "Delivered Qty"
 msgstr ""
 
@@ -22389,7 +22713,7 @@
 msgid "Delivery"
 msgstr ""
 
-#: public/js/utils.js:742 selling/doctype/sales_order/sales_order.js:1012
+#: public/js/utils.js:740 selling/doctype/sales_order/sales_order.js:1012
 #: selling/report/sales_order_analysis/sales_order_analysis.py:321
 msgid "Delivery Date"
 msgstr ""
@@ -22425,8 +22749,8 @@
 #: accounts/doctype/sales_invoice/sales_invoice.js:316
 #: accounts/doctype/sales_invoice/sales_invoice_list.js:35
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:20
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:286
-#: accounts/report/sales_register/sales_register.py:243
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:291
+#: accounts/report/sales_register/sales_register.py:244
 #: selling/doctype/sales_order/sales_order.js:619
 #: selling/doctype/sales_order/sales_order_list.js:70
 #: stock/doctype/delivery_note/delivery_note.json
@@ -22548,20 +22872,20 @@
 msgid "Delivery Note Trends"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1155
+#: accounts/doctype/sales_invoice/sales_invoice.py:1159
 msgid "Delivery Note {0} is not submitted"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:1005
+#: stock/doctype/pick_list/pick_list.py:996
 msgid "Delivery Note(s) created for the Pick List"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1100
+#: accounts/report/accounts_receivable/accounts_receivable.py:1090
 #: stock/doctype/delivery_trip/delivery_trip.js:72
 msgid "Delivery Notes"
 msgstr ""
 
-#: stock/doctype/delivery_trip/delivery_trip.py:120
+#: stock/doctype/delivery_trip/delivery_trip.py:118
 msgid "Delivery Notes {0} updated"
 msgstr ""
 
@@ -22636,7 +22960,7 @@
 msgid "Delivery to"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:354
+#: selling/doctype/sales_order/sales_order.py:362
 msgid "Delivery warehouse required for stock item {0}"
 msgstr ""
 
@@ -22651,7 +22975,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: assets/report/fixed_asset_register/fixed_asset_register.py:468
+#: assets/report/fixed_asset_register/fixed_asset_register.py:458
 #: setup/doctype/department/department.json
 msgid "Department"
 msgstr ""
@@ -22789,16 +23113,16 @@
 msgid "Depreciate based on shifts"
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.py:205
-#: assets/report/fixed_asset_register/fixed_asset_register.py:393
-#: assets/report/fixed_asset_register/fixed_asset_register.py:454
+#: assets/report/fixed_asset_register/fixed_asset_register.py:201
+#: assets/report/fixed_asset_register/fixed_asset_register.py:383
+#: assets/report/fixed_asset_register/fixed_asset_register.py:444
 msgid "Depreciated Amount"
 msgstr ""
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:56
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:81
 #: accounts/report/account_balance/account_balance.js:44
-#: accounts/report/cash_flow/cash_flow.py:129
+#: accounts/report/cash_flow/cash_flow.py:127
 msgid "Depreciation"
 msgstr ""
 
@@ -22826,7 +23150,7 @@
 msgid "Depreciation Amount"
 msgstr ""
 
-#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:411
+#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:403
 msgid "Depreciation Amount during the period"
 msgstr ""
 
@@ -22840,7 +23164,7 @@
 msgid "Depreciation Details"
 msgstr ""
 
-#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:417
+#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:409
 msgid "Depreciation Eliminated due to disposal of assets"
 msgstr ""
 
@@ -22879,7 +23203,7 @@
 msgid "Depreciation Expense Account"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:388
+#: assets/doctype/asset/depreciation.py:381
 msgid "Depreciation Expense Account should be an Income or Expense Account."
 msgstr ""
 
@@ -22917,15 +23241,15 @@
 msgid "Depreciation Posting Date should not be equal to Available for Use Date."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:493
+#: assets/doctype/asset/asset.py:488
 msgid "Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:462
+#: assets/doctype/asset/asset.py:457
 msgid "Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:453
+#: assets/doctype/asset/asset.py:448
 msgid "Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date"
 msgstr ""
 
@@ -22960,24 +23284,24 @@
 msgid "Depreciation Schedule View"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:349
+#: assets/doctype/asset/asset.py:347
 msgid "Depreciation cannot be calculated for fully depreciated assets"
 msgstr ""
 
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:71
-#: accounts/report/gross_profit/gross_profit.py:245
-#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:175
+#: accounts/report/gross_profit/gross_profit.py:243
+#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:174
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:192
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:71
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:207
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:205
 #: manufacturing/doctype/bom/bom_item_preview.html:12
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:58
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:56
 #: manufacturing/report/bom_stock_report/bom_stock_report.html:10
 #: manufacturing/report/bom_stock_report/bom_stock_report.html:20
 #: manufacturing/report/bom_stock_report/bom_stock_report.py:26
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:112
 #: public/js/bank_reconciliation_tool/data_table_manager.js:55
-#: public/js/controllers/transaction.js:2181
+#: public/js/controllers/transaction.js:2182
 #: selling/doctype/quotation/quotation.js:291
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:41
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:35
@@ -22986,13 +23310,13 @@
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:76
 #: stock/report/item_prices/item_prices.py:54
 #: stock/report/item_shortage_report/item_shortage_report.py:144
-#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:59
+#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:57
 #: stock/report/product_bundle_balance/product_bundle_balance.py:112
-#: stock/report/stock_ageing/stock_ageing.py:126
+#: stock/report/stock_ageing/stock_ageing.py:125
 #: stock/report/stock_ledger/stock_ledger.py:260
 #: stock/report/stock_projected_qty/stock_projected_qty.py:106
-#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60
-#: stock/report/total_stock_summary/total_stock_summary.py:23
+#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:59
+#: stock/report/total_stock_summary/total_stock_summary.py:22
 #: templates/generators/bom.html:83
 msgid "Description"
 msgstr ""
@@ -23468,6 +23792,12 @@
 msgid "Description"
 msgstr ""
 
+#. Label of a Small Text field in DocType 'UOM'
+#: setup/doctype/uom/uom.json
+msgctxt "UOM"
+msgid "Description"
+msgstr ""
+
 #. Label of a Text Editor field in DocType 'Video'
 #: utilities/doctype/video/video.json
 msgctxt "Video"
@@ -23555,7 +23885,7 @@
 msgid "Desk User"
 msgstr ""
 
-#: public/js/utils/sales_common.js:482
+#: public/js/utils/sales_common.js:479
 msgid "Detailed Reason"
 msgstr ""
 
@@ -23653,7 +23983,7 @@
 msgid "Diesel"
 msgstr ""
 
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:175
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:173
 #: public/js/bank_reconciliation_tool/number_card.js:30
 #: stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.py:130
 #: stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:35
@@ -23713,11 +24043,11 @@
 msgid "Difference Account"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:528
+#: stock/doctype/stock_entry/stock_entry.py:529
 msgid "Difference Account must be a Asset/Liability type account, since this Stock Entry is an Opening Entry"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:768
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:766
 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry"
 msgstr ""
 
@@ -23776,12 +24106,12 @@
 msgid "Difference Posting Date"
 msgstr ""
 
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:94
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:92
 msgid "Difference Qty"
 msgstr ""
 
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:140
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:132
+#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:136
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:130
 msgid "Difference Value"
 msgstr ""
 
@@ -23789,7 +24119,7 @@
 msgid "Different 'Source Warehouse' and 'Target Warehouse' can be set for each row."
 msgstr ""
 
-#: stock/doctype/packing_slip/packing_slip.py:194
+#: stock/doctype/packing_slip/packing_slip.py:192
 msgid "Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM."
 msgstr ""
 
@@ -24128,19 +24458,19 @@
 msgid "Disabled Account Selected"
 msgstr ""
 
-#: stock/utils.py:449
+#: stock/utils.py:435
 msgid "Disabled Warehouse {0} cannot be used for this transaction."
 msgstr ""
 
-#: controllers/accounts_controller.py:594
+#: controllers/accounts_controller.py:603
 msgid "Disabled pricing rules since this {} is an internal transfer"
 msgstr ""
 
-#: controllers/accounts_controller.py:608
+#: controllers/accounts_controller.py:617
 msgid "Disabled tax included prices since this {} is an internal transfer"
 msgstr ""
 
-#: accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py:81
+#: accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py:79
 msgid "Disabled template must not be default template"
 msgstr ""
 
@@ -24436,11 +24766,11 @@
 msgid "Discount cannot be greater than 100%"
 msgstr ""
 
-#: setup/doctype/authorization_rule/authorization_rule.py:95
+#: setup/doctype/authorization_rule/authorization_rule.py:93
 msgid "Discount must be less than 100"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:2561
+#: accounts/doctype/payment_entry/payment_entry.py:2564
 msgid "Discount of {} applied as per Payment Term"
 msgstr ""
 
@@ -24526,23 +24856,23 @@
 msgid "Dislikes"
 msgstr ""
 
-#: setup/doctype/company/company.py:352
+#: setup/doctype/company/company.py:344
 msgid "Dispatch"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Delivery Note'
+#. Label of a Text Editor field in DocType 'Delivery Note'
 #: stock/doctype/delivery_note/delivery_note.json
 msgctxt "Delivery Note"
 msgid "Dispatch Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Sales Invoice'
+#. Label of a Text Editor field in DocType 'Sales Invoice'
 #: accounts/doctype/sales_invoice/sales_invoice.json
 msgctxt "Sales Invoice"
 msgid "Dispatch Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Sales Order'
+#. Label of a Text Editor field in DocType 'Sales Order'
 #: selling/doctype/sales_order/sales_order.json
 msgctxt "Sales Order"
 msgid "Dispatch Address"
@@ -24575,8 +24905,8 @@
 #: patches/v11_0/add_default_dispatch_notification_template.py:11
 #: patches/v11_0/add_default_dispatch_notification_template.py:20
 #: patches/v11_0/add_default_dispatch_notification_template.py:28
-#: setup/setup_wizard/operations/defaults_setup.py:59
-#: setup/setup_wizard/operations/install_fixtures.py:286
+#: setup/setup_wizard/operations/defaults_setup.py:57
+#: setup/setup_wizard/operations/install_fixtures.py:284
 msgid "Dispatch Notification"
 msgstr ""
 
@@ -24861,7 +25191,7 @@
 msgid "Document Type "
 msgstr ""
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:60
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:58
 msgid "Document Type already used as a dimension"
 msgstr ""
 
@@ -24875,7 +25205,7 @@
 msgid "Documents"
 msgstr ""
 
-#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:202
+#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:204
 msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
 msgstr ""
 
@@ -24909,9 +25239,9 @@
 msgid "Don't Send Emails"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.py:322
-#: erpnext_integrations/doctype/tally_migration/tally_migration.py:407
-#: erpnext_integrations/doctype/tally_migration/tally_migration.py:583
+#: erpnext_integrations/doctype/tally_migration/tally_migration.py:328
+#: erpnext_integrations/doctype/tally_migration/tally_migration.py:413
+#: erpnext_integrations/doctype/tally_migration/tally_migration.py:589
 #: public/js/utils/crm_activities.js:212
 msgid "Done"
 msgstr ""
@@ -25253,6 +25583,11 @@
 msgid "Draft"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Dram"
+msgstr ""
+
 #. Name of a DocType
 #: setup/doctype/driver/driver.json
 msgid "Driver"
@@ -25341,7 +25676,7 @@
 msgid "Drop Ship"
 msgstr ""
 
-#: accounts/party.py:664
+#: accounts/party.py:640
 msgid "Due / Reference Date cannot be after {0}"
 msgstr ""
 
@@ -25423,11 +25758,11 @@
 msgid "Due Date Based On"
 msgstr ""
 
-#: accounts/party.py:640
+#: accounts/party.py:616
 msgid "Due Date cannot be before Posting / Supplier Invoice Date"
 msgstr ""
 
-#: controllers/accounts_controller.py:628
+#: controllers/accounts_controller.py:639
 msgid "Due Date is mandatory"
 msgstr ""
 
@@ -25527,7 +25862,7 @@
 msgid "Duplicate Entry. Please check Authorization Rule {0}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:303
+#: assets/doctype/asset/asset.py:299
 msgid "Duplicate Finance Book"
 msgstr ""
 
@@ -25596,15 +25931,20 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:93
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:133
-#: setup/setup_wizard/operations/taxes_setup.py:248
+#: setup/setup_wizard/operations/taxes_setup.py:251
 msgid "Duties and Taxes"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Dyne"
+msgstr ""
+
 #: regional/italy/utils.py:247 regional/italy/utils.py:267
 #: regional/italy/utils.py:278 regional/italy/utils.py:286
 #: regional/italy/utils.py:293 regional/italy/utils.py:297
-#: regional/italy/utils.py:304 regional/italy/utils.py:311
-#: regional/italy/utils.py:333 regional/italy/utils.py:339
+#: regional/italy/utils.py:304 regional/italy/utils.py:313
+#: regional/italy/utils.py:335 regional/italy/utils.py:341
 #: regional/italy/utils.py:348 regional/italy/utils.py:453
 msgid "E-Invoicing Information Missing"
 msgstr ""
@@ -25627,6 +25967,16 @@
 msgid "EAN-8"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "EMU Of Charge"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "EMU of current"
+msgstr ""
+
 #. Label of a Data field in DocType 'Tally Migration'
 #: erpnext_integrations/doctype/tally_migration/tally_migration.json
 msgctxt "Tally Migration"
@@ -25653,11 +26003,11 @@
 msgid "Each Transaction"
 msgstr ""
 
-#: stock/report/stock_ageing/stock_ageing.py:163
+#: stock/report/stock_ageing/stock_ageing.py:162
 msgid "Earliest"
 msgstr ""
 
-#: stock/report/stock_balance/stock_balance.py:486
+#: stock/report/stock_balance/stock_balance.py:485
 msgid "Earliest Age"
 msgstr ""
 
@@ -25683,7 +26033,7 @@
 msgid "Edit Full Form"
 msgstr ""
 
-#: controllers/item_variant.py:158
+#: controllers/item_variant.py:154
 msgid "Edit Not Allowed"
 msgstr ""
 
@@ -25827,6 +26177,11 @@
 msgid "Electronic Invoice Register"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Ells (UK)"
+msgstr ""
+
 #: buying/doctype/request_for_quotation/request_for_quotation.js:249
 #: crm/report/lead_details/lead_details.py:41
 #: selling/page/point_of_sale/pos_item_cart.js:904
@@ -25917,7 +26272,7 @@
 msgid "Email Address (required)"
 msgstr ""
 
-#: crm/doctype/lead/lead.py:164
+#: crm/doctype/lead/lead.py:162
 msgid "Email Address must be unique, it is already used in {0}"
 msgstr ""
 
@@ -26011,7 +26366,7 @@
 msgid "Email Sent"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:313
+#: buying/doctype/request_for_quotation/request_for_quotation.py:312
 msgid "Email Sent to Supplier {0}"
 msgstr ""
 
@@ -26057,7 +26412,7 @@
 msgid "Email sent to"
 msgstr ""
 
-#: stock/doctype/delivery_trip/delivery_trip.py:419
+#: stock/doctype/delivery_trip/delivery_trip.py:414
 msgid "Email sent to {0}"
 msgstr ""
 
@@ -26288,11 +26643,11 @@
 msgid "Employee cannot report to himself."
 msgstr ""
 
-#: assets/doctype/asset_movement/asset_movement.py:71
+#: assets/doctype/asset_movement/asset_movement.py:73
 msgid "Employee is required while issuing Asset {0}"
 msgstr ""
 
-#: assets/doctype/asset_movement/asset_movement.py:115
+#: assets/doctype/asset_movement/asset_movement.py:123
 msgid "Employee {0} does not belongs to the company {1}"
 msgstr ""
 
@@ -26300,7 +26655,12 @@
 msgid "Empty"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1044
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Ems(Pica)"
+msgstr ""
+
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1030
 msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
 msgstr ""
 
@@ -26316,7 +26676,7 @@
 msgid "Enable Auto Email"
 msgstr ""
 
-#: stock/doctype/item/item.py:1040
+#: stock/doctype/item/item.py:1028
 msgid "Enable Auto Re-Order"
 msgstr ""
 
@@ -26658,7 +27018,7 @@
 msgid "Ensure Delivery Based on Produced Serial No"
 msgstr ""
 
-#: stock/doctype/delivery_trip/delivery_trip.py:253
+#: stock/doctype/delivery_trip/delivery_trip.py:251
 msgid "Enter API key in Google Settings."
 msgstr ""
 
@@ -26712,7 +27072,7 @@
 msgid "Enter customer's phone number"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:347
+#: assets/doctype/asset/asset.py:345
 msgid "Enter depreciation details"
 msgstr ""
 
@@ -26776,7 +27136,7 @@
 msgid "Entity"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:203
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:201
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:123
 msgid "Entity Type"
 msgstr ""
@@ -26803,7 +27163,7 @@
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:150
 #: accounts/report/account_balance/account_balance.js:29
 #: accounts/report/account_balance/account_balance.js:45
-#: accounts/report/balance_sheet/balance_sheet.py:242
+#: accounts/report/balance_sheet/balance_sheet.py:241
 #: setup/setup_wizard/operations/install_fixtures.py:259
 msgid "Equity"
 msgstr ""
@@ -26827,9 +27187,14 @@
 msgid "Equity/Liability Account"
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:413
-#: manufacturing/doctype/job_card/job_card.py:780
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:197
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Erg"
+msgstr ""
+
+#: accounts/doctype/payment_request/payment_request.py:409
+#: manufacturing/doctype/job_card/job_card.py:772
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:194
 msgid "Error"
 msgstr ""
 
@@ -26913,7 +27278,7 @@
 msgid "Error Occurred"
 msgstr ""
 
-#: telephony/doctype/call_log/call_log.py:195
+#: telephony/doctype/call_log/call_log.py:193
 msgid "Error during caller information update"
 msgstr ""
 
@@ -26925,15 +27290,15 @@
 msgid "Error occurred while parsing Chart of Accounts: Please make sure that no two accounts have the same name"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:404
+#: assets/doctype/asset/depreciation.py:397
 msgid "Error while posting depreciation entries"
 msgstr ""
 
-#: accounts/deferred_revenue.py:567
+#: accounts/deferred_revenue.py:539
 msgid "Error while processing deferred accounting for {0}"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:404
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:401
 msgid "Error while reposting item valuation"
 msgstr ""
 
@@ -26992,7 +27357,7 @@
 msgid "Example URL"
 msgstr ""
 
-#: stock/doctype/item/item.py:971
+#: stock/doctype/item/item.py:959
 msgid "Example of a linked document: {0}"
 msgstr ""
 
@@ -27010,7 +27375,7 @@
 msgid "Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings."
 msgstr ""
 
-#: stock/stock_ledger.py:1983
+#: stock/stock_ledger.py:1949
 msgid "Example: Serial No {0} reserved in {1}."
 msgstr ""
 
@@ -27024,7 +27389,7 @@
 msgid "Excess Materials Consumed"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:876
+#: manufacturing/doctype/job_card/job_card.py:866
 msgid "Excess Transfer"
 msgstr ""
 
@@ -27048,7 +27413,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:73
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:97
-#: setup/doctype/company/company.py:516
+#: setup/doctype/company/company.py:508
 msgid "Exchange Gain/Loss"
 msgstr ""
 
@@ -27070,8 +27435,8 @@
 msgid "Exchange Gain/Loss"
 msgstr ""
 
-#: controllers/accounts_controller.py:1382
-#: controllers/accounts_controller.py:1463
+#: controllers/accounts_controller.py:1389
+#: controllers/accounts_controller.py:1470
 msgid "Exchange Gain/Loss amount has been booked through {0}"
 msgstr ""
 
@@ -27238,7 +27603,7 @@
 msgid "Exchange Rate Revaluation Settings"
 msgstr ""
 
-#: controllers/sales_and_purchase_return.py:59
+#: controllers/sales_and_purchase_return.py:57
 msgid "Exchange Rate must be same as {0} {1} ({2})"
 msgstr ""
 
@@ -27255,7 +27620,7 @@
 msgid "Excise Entry"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.js:1213
+#: stock/doctype/stock_entry/stock_entry.js:1229
 msgid "Excise Invoice"
 msgstr ""
 
@@ -27275,7 +27640,7 @@
 msgid "Execution"
 msgstr ""
 
-#: regional/report/uae_vat_201/uae_vat_201.py:70
+#: regional/report/uae_vat_201/uae_vat_201.py:67
 msgid "Exempt Supplies"
 msgstr ""
 
@@ -27310,7 +27675,7 @@
 msgid "Expand All"
 msgstr ""
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:413
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411
 msgid "Expected"
 msgstr ""
 
@@ -27320,7 +27685,7 @@
 msgid "Expected Amount"
 msgstr ""
 
-#: manufacturing/report/production_planning_report/production_planning_report.py:414
+#: manufacturing/report/production_planning_report/production_planning_report.py:417
 msgid "Expected Arrival Date"
 msgstr ""
 
@@ -27364,7 +27729,7 @@
 msgid "Expected Delivery Date"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:319
+#: selling/doctype/sales_order/sales_order.py:324
 msgid "Expected Delivery Date should be after Sales Order Date"
 msgstr ""
 
@@ -27430,7 +27795,7 @@
 msgid "Expected Start Date"
 msgstr ""
 
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:133
+#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:129
 msgid "Expected Stock Value"
 msgstr ""
 
@@ -27460,7 +27825,7 @@
 
 #: accounts/report/account_balance/account_balance.js:28
 #: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:89
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:174
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:172
 #: accounts/report/profitability_analysis/profitability_analysis.py:189
 msgid "Expense"
 msgstr ""
@@ -27490,12 +27855,12 @@
 msgid "Expense"
 msgstr ""
 
-#: controllers/stock_controller.py:541
+#: controllers/stock_controller.py:556
 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
 msgstr ""
 
 #: accounts/report/account_balance/account_balance.js:46
-#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:248
+#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:252
 msgid "Expense Account"
 msgstr ""
 
@@ -27577,7 +27942,7 @@
 msgid "Expense Account"
 msgstr ""
 
-#: controllers/stock_controller.py:521
+#: controllers/stock_controller.py:536
 msgid "Expense Account Missing"
 msgstr ""
 
@@ -27594,13 +27959,13 @@
 msgid "Expense Head"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:494
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:514
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:532
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:492
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:516
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:536
 msgid "Expense Head Changed"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:556
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:560
 msgid "Expense account is mandatory for item {0}"
 msgstr ""
 
@@ -27745,7 +28110,7 @@
 msgid "Extra Consumed Qty"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:197
+#: manufacturing/doctype/job_card/job_card.py:193
 msgid "Extra Job Card Quantity"
 msgstr ""
 
@@ -27781,7 +28146,7 @@
 msgid "FG Reference"
 msgstr ""
 
-#: manufacturing/report/process_loss_report/process_loss_report.py:106
+#: manufacturing/report/process_loss_report/process_loss_report.py:105
 msgid "FG Value"
 msgstr ""
 
@@ -27829,12 +28194,17 @@
 msgid "FIFO Stock Queue (qty, rate)"
 msgstr ""
 
-#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:180
+#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:179
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:195
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:119
 msgid "FIFO/LIFO Queue"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Fahrenheit"
+msgstr ""
+
 #: accounts/doctype/payment_request/payment_request_list.js:16
 #: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:68
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:13
@@ -27991,7 +28361,7 @@
 msgid "Failed to setup defaults"
 msgstr ""
 
-#: setup/doctype/company/company.py:698
+#: setup/doctype/company/company.py:690
 msgid "Failed to setup defaults for country {0}. Please contact support."
 msgstr ""
 
@@ -28021,6 +28391,16 @@
 msgid "Family Background"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Faraday"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Fathom"
+msgstr ""
+
 #. Label of a Data field in DocType 'Company'
 #: setup/doctype/company/company.json
 msgctxt "Company"
@@ -28114,7 +28494,7 @@
 msgstr ""
 
 #: stock/doctype/material_request/material_request.js:318
-#: stock/doctype/stock_entry/stock_entry.js:640
+#: stock/doctype/stock_entry/stock_entry.js:654
 msgid "Fetch exploded BOM (including sub-assemblies)"
 msgstr ""
 
@@ -28502,7 +28882,7 @@
 msgid "Finished Good BOM"
 msgstr ""
 
-#: public/js/utils.js:768
+#: public/js/utils.js:766
 msgid "Finished Good Item"
 msgstr ""
 
@@ -28516,7 +28896,7 @@
 msgid "Finished Good Item Code"
 msgstr ""
 
-#: public/js/utils.js:786
+#: public/js/utils.js:784
 msgid "Finished Good Item Qty"
 msgstr ""
 
@@ -28526,15 +28906,15 @@
 msgid "Finished Good Item Quantity"
 msgstr ""
 
-#: controllers/accounts_controller.py:3295
+#: controllers/accounts_controller.py:3253
 msgid "Finished Good Item is not specified for service item {0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:3310
+#: controllers/accounts_controller.py:3270
 msgid "Finished Good Item {0} Qty can not be zero"
 msgstr ""
 
-#: controllers/accounts_controller.py:3304
+#: controllers/accounts_controller.py:3264
 msgid "Finished Good Item {0} must be a sub-contracted item"
 msgstr ""
 
@@ -28562,7 +28942,7 @@
 msgid "Finished Good UOM"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_bom/subcontracting_bom.py:53
+#: subcontracting/doctype/subcontracting_bom/subcontracting_bom.py:51
 msgid "Finished Good {0} does not have a default BOM."
 msgstr ""
 
@@ -28570,15 +28950,15 @@
 msgid "Finished Good {0} is disabled."
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_bom/subcontracting_bom.py:49
+#: subcontracting/doctype/subcontracting_bom/subcontracting_bom.py:48
 msgid "Finished Good {0} must be a stock item."
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_bom/subcontracting_bom.py:57
+#: subcontracting/doctype/subcontracting_bom/subcontracting_bom.py:55
 msgid "Finished Good {0} must be a sub-contracted item."
 msgstr ""
 
-#: setup/doctype/company/company.py:261
+#: setup/doctype/company/company.py:258
 msgid "Finished Goods"
 msgstr ""
 
@@ -28586,7 +28966,7 @@
 msgid "Finished Goods Warehouse"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1273
+#: stock/doctype/stock_entry/stock_entry.py:1282
 msgid "Finished Item {0} does not match with Work Order {1}"
 msgstr ""
 
@@ -28626,8 +29006,8 @@
 msgid "First Response Due"
 msgstr ""
 
-#: support/doctype/issue/test_issue.py:241
-#: support/doctype/service_level_agreement/service_level_agreement.py:899
+#: support/doctype/issue/test_issue.py:238
+#: support/doctype/service_level_agreement/service_level_agreement.py:894
 msgid "First Response SLA Failed by {}"
 msgstr ""
 
@@ -28789,7 +29169,7 @@
 msgid "Fixed Asset Defaults"
 msgstr ""
 
-#: stock/doctype/item/item.py:301
+#: stock/doctype/item/item.py:300
 msgid "Fixed Asset Item must be a non-stock item."
 msgstr ""
 
@@ -28847,6 +29227,16 @@
 msgid "Floor Name"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Fluid Ounce (UK)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Fluid Ounce (US)"
+msgstr ""
+
 #: selling/page/point_of_sale/pos_item_selector.js:300
 msgid "Focus on Item Group filter"
 msgstr ""
@@ -28871,18 +29261,38 @@
 msgid "Following Material Requests have been raised automatically based on Item's re-order level"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:751
+#: selling/doctype/customer/customer.py:740
 msgid "Following fields are mandatory to create address:"
 msgstr ""
 
-#: controllers/buying_controller.py:932
+#: controllers/buying_controller.py:933
 msgid "Following item {0} is not marked as {1} item. You can enable them as {1} item from its Item master"
 msgstr ""
 
-#: controllers/buying_controller.py:928
+#: controllers/buying_controller.py:929
 msgid "Following items {0} are not marked as {1} item. You can enable them as {1} item from its Item master"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Foot"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Foot Of Water"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Foot/Minute"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Foot/Second"
+msgstr ""
+
 #: accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:23
 msgid "For"
 msgstr ""
@@ -28912,7 +29322,7 @@
 msgid "For Item"
 msgstr ""
 
-#: controllers/stock_controller.py:953
+#: controllers/stock_controller.py:977
 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
 msgstr ""
 
@@ -28947,11 +29357,11 @@
 msgid "For Production"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:612
+#: stock/doctype/stock_entry/stock_entry.py:613
 msgid "For Quantity (Manufactured Qty) is mandatory"
 msgstr ""
 
-#: controllers/accounts_controller.py:1070
+#: controllers/accounts_controller.py:1082
 msgid "For Return Invoices with Stock effect, '0' qty Items are not allowed. Following rows are affected: {0}"
 msgstr ""
 
@@ -28978,7 +29388,7 @@
 msgid "For Warehouse"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:438
+#: manufacturing/doctype/work_order/work_order.py:432
 msgid "For Warehouse is required before Submit"
 msgstr ""
 
@@ -29024,15 +29434,15 @@
 msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:339
+#: stock/doctype/stock_entry/stock_entry.py:336
 msgid "For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:1537
+#: manufacturing/doctype/work_order/work_order.py:1530
 msgid "For operation {0}: Quantity ({1}) can not be greater than pending quantity({2})"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1311
+#: stock/doctype/stock_entry/stock_entry.py:1320
 msgid "For quantity {0} should not be greater than allowed quantity {1}"
 msgstr ""
 
@@ -29047,7 +29457,7 @@
 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:1520
+#: manufacturing/doctype/production_plan/production_plan.py:1509
 msgid "For row {0}: Enter Planned Qty"
 msgstr ""
 
@@ -29122,7 +29532,7 @@
 msgid "Free item code is not selected"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:656
+#: accounts/doctype/pricing_rule/utils.py:645
 msgid "Free item not set in the pricing rule {0}"
 msgstr ""
 
@@ -29309,7 +29719,7 @@
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:8
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:16
 #: accounts/report/pos_register/pos_register.js:16
-#: accounts/report/pos_register/pos_register.py:114
+#: accounts/report/pos_register/pos_register.py:110
 #: accounts/report/profitability_analysis/profitability_analysis.js:59
 #: accounts/report/purchase_register/purchase_register.js:8
 #: accounts/report/sales_payment_summary/sales_payment_summary.js:7
@@ -29504,11 +29914,11 @@
 
 #: accounts/report/customer_ledger_summary/customer_ledger_summary.py:21
 #: accounts/report/general_ledger/general_ledger.py:85
-#: accounts/report/pos_register/pos_register.py:118
+#: accounts/report/pos_register/pos_register.py:114
 #: accounts/report/tax_withholding_details/tax_withholding_details.py:37
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:41
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:37
-#: stock/report/cogs_by_item_group/cogs_by_item_group.py:39
+#: stock/report/cogs_by_item_group/cogs_by_item_group.py:38
 msgid "From Date must be before To Date"
 msgstr ""
 
@@ -29805,7 +30215,7 @@
 msgid "From and To Dates are required."
 msgstr ""
 
-#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:168
+#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:166
 msgid "From and To dates are required"
 msgstr ""
 
@@ -29992,6 +30402,11 @@
 msgid "Fully Paid"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Furlong"
+msgstr ""
+
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:28
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:41
 msgid "Furniture and Fixtures"
@@ -30011,14 +30426,14 @@
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:185
 #: accounts/report/accounts_receivable/accounts_receivable.html:155
-#: accounts/report/accounts_receivable/accounts_receivable.py:1092
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:180
+#: accounts/report/accounts_receivable/accounts_receivable.py:1082
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:178
 msgid "Future Payment Amount"
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:184
 #: accounts/report/accounts_receivable/accounts_receivable.html:154
-#: accounts/report/accounts_receivable/accounts_receivable.py:1091
+#: accounts/report/accounts_receivable/accounts_receivable.py:1081
 msgid "Future Payment Ref"
 msgstr ""
 
@@ -30032,14 +30447,14 @@
 msgid "G - D"
 msgstr ""
 
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:174
-#: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:243
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:172
+#: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240
 msgid "GL Balance"
 msgstr ""
 
 #. Name of a DocType
 #: accounts/doctype/gl_entry/gl_entry.json
-#: accounts/report/general_ledger/general_ledger.py:570
+#: accounts/report/general_ledger/general_ledger.py:561
 msgid "GL Entry"
 msgstr ""
 
@@ -30100,10 +30515,30 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:74
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:98
-#: setup/doctype/company/company.py:524
+#: setup/doctype/company/company.py:516
 msgid "Gain/Loss on Asset Disposal"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Gallon (UK)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Gallon Dry (US)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Gallon Liquid (US)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Gamma"
+msgstr ""
+
 #: projects/doctype/project/project.js:93
 msgid "Gantt Chart"
 msgstr ""
@@ -30112,6 +30547,11 @@
 msgid "Gantt chart of all tasks."
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Gauss"
+msgstr ""
+
 #. Label of a Link field in DocType 'Customer'
 #: selling/doctype/customer/customer.json
 msgctxt "Customer"
@@ -30161,7 +30601,7 @@
 msgid "General Ledger"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse.js:68
+#: stock/doctype/warehouse/warehouse.js:69
 msgctxt "Warehouse"
 msgid "General Ledger"
 msgstr ""
@@ -30308,8 +30748,8 @@
 #: accounts/doctype/sales_invoice/sales_invoice.js:280
 #: accounts/doctype/sales_invoice/sales_invoice.js:309
 #: accounts/doctype/sales_invoice/sales_invoice.js:340
-#: buying/doctype/purchase_order/purchase_order.js:525
-#: buying/doctype/purchase_order/purchase_order.js:545
+#: buying/doctype/purchase_order/purchase_order.js:531
+#: buying/doctype/purchase_order/purchase_order.js:551
 #: buying/doctype/request_for_quotation/request_for_quotation.js:335
 #: buying/doctype/request_for_quotation/request_for_quotation.js:357
 #: buying/doctype/request_for_quotation/request_for_quotation.js:402
@@ -30331,8 +30771,8 @@
 #: stock/doctype/stock_entry/stock_entry.js:309
 #: stock/doctype/stock_entry/stock_entry.js:356
 #: stock/doctype/stock_entry/stock_entry.js:384
-#: stock/doctype/stock_entry/stock_entry.js:443
-#: stock/doctype/stock_entry/stock_entry.js:603
+#: stock/doctype/stock_entry/stock_entry.js:457
+#: stock/doctype/stock_entry/stock_entry.js:617
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:119
 msgid "Get Items From"
 msgstr ""
@@ -30350,8 +30790,8 @@
 msgstr ""
 
 #: stock/doctype/material_request/material_request.js:295
-#: stock/doctype/stock_entry/stock_entry.js:643
-#: stock/doctype/stock_entry/stock_entry.js:656
+#: stock/doctype/stock_entry/stock_entry.js:657
+#: stock/doctype/stock_entry/stock_entry.js:670
 msgid "Get Items from BOM"
 msgstr ""
 
@@ -30365,7 +30805,7 @@
 msgid "Get Items from Open Material Requests"
 msgstr ""
 
-#: public/js/controllers/buying.js:504
+#: public/js/controllers/buying.js:498
 msgid "Get Items from Product Bundle"
 msgstr ""
 
@@ -30570,7 +31010,7 @@
 msgid "Goods"
 msgstr ""
 
-#: setup/doctype/company/company.py:262
+#: setup/doctype/company/company.py:259
 #: stock/doctype/stock_entry/stock_entry_list.js:21
 msgid "Goods In Transit"
 msgstr ""
@@ -30579,7 +31019,7 @@
 msgid "Goods Transferred"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1627
+#: stock/doctype/stock_entry/stock_entry.py:1647
 msgid "Goods are already received against the outward entry {0}"
 msgstr ""
 
@@ -30599,11 +31039,61 @@
 msgid "Graduate"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Grain"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Grain/Cubic Foot"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Grain/Gallon (UK)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Grain/Gallon (US)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Gram"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Gram-Force"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Gram/Cubic Centimeter"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Gram/Cubic Meter"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Gram/Cubic Millimeter"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Gram/Litre"
+msgstr ""
+
 #: accounts/doctype/pos_closing_entry/closing_voucher_details.html:15
-#: accounts/report/pos_register/pos_register.py:207
+#: accounts/report/pos_register/pos_register.py:201
 #: accounts/report/purchase_register/purchase_register.py:275
-#: accounts/report/sales_register/sales_register.py:303
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:251
+#: accounts/report/sales_register/sales_register.py:304
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:249
 #: selling/page/point_of_sale/pos_item_cart.js:92
 #: selling/page/point_of_sale/pos_item_cart.js:531
 #: selling/page/point_of_sale/pos_item_cart.js:535
@@ -30897,7 +31387,7 @@
 #. Name of a report
 #. Label of a Link in the Financial Reports Workspace
 #: accounts/report/gross_profit/gross_profit.json
-#: accounts/report/gross_profit/gross_profit.py:287
+#: accounts/report/gross_profit/gross_profit.py:285
 #: accounts/workspace/financial_reports/financial_reports.json
 msgid "Gross Profit"
 msgstr ""
@@ -30918,12 +31408,12 @@
 msgid "Gross Profit / Loss"
 msgstr ""
 
-#: accounts/report/gross_profit/gross_profit.py:294
+#: accounts/report/gross_profit/gross_profit.py:292
 msgid "Gross Profit Percent"
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.py:379
-#: assets/report/fixed_asset_register/fixed_asset_register.py:433
+#: assets/report/fixed_asset_register/fixed_asset_register.py:369
+#: assets/report/fixed_asset_register/fixed_asset_register.py:423
 msgid "Gross Purchase Amount"
 msgstr ""
 
@@ -30939,11 +31429,11 @@
 msgid "Gross Purchase Amount"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:319
+#: assets/doctype/asset/asset.py:315
 msgid "Gross Purchase Amount is mandatory"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:364
+#: assets/doctype/asset/asset.py:360
 msgid "Gross Purchase Amount should be <b>equal</b> to purchase amount of one single Asset."
 msgstr ""
 
@@ -31068,7 +31558,7 @@
 msgid "Group by Voucher (Consolidated)"
 msgstr ""
 
-#: stock/utils.py:443
+#: stock/utils.py:429
 msgid "Group node warehouse is not allowed to select for transactions"
 msgstr ""
 
@@ -31195,6 +31685,11 @@
 msgid "Half-yearly"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Hand"
+msgstr ""
+
 #: setup/setup_wizard/operations/install_fixtures.py:179
 msgid "Hardware"
 msgstr ""
@@ -31360,6 +31855,26 @@
 msgid "Heatmap"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Hectare"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Hectogram/Litre"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Hectometer"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Hectopascal"
+msgstr ""
+
 #. Label of a Int field in DocType 'Shipment Parcel'
 #: stock/doctype/shipment_parcel/shipment_parcel.json
 msgctxt "Shipment Parcel"
@@ -31372,7 +31887,7 @@
 msgid "Height (cm)"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:410
+#: assets/doctype/asset/depreciation.py:403
 msgid "Hello,"
 msgstr ""
 
@@ -31411,11 +31926,11 @@
 msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:417
+#: assets/doctype/asset/depreciation.py:410
 msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
 msgstr ""
 
-#: stock/stock_ledger.py:1689
+#: stock/stock_ledger.py:1661
 msgid "Here are the options to proceed:"
 msgstr ""
 
@@ -31440,7 +31955,12 @@
 msgid "Here, your weekly offs are pre-populated based on the previous selections. You can add more rows to also add public and national holidays individually."
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:406
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Hertz"
+msgstr ""
+
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:403
 msgid "Hi,"
 msgstr ""
 
@@ -31587,6 +32107,21 @@
 msgid "Home"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Horsepower"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Horsepower-Hours"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Hour"
+msgstr ""
+
 #. Label of a Currency field in DocType 'BOM Operation'
 #: manufacturing/doctype/bom_operation/bom_operation.json
 msgctxt "BOM Operation"
@@ -31658,10 +32193,20 @@
 msgid "Hrs"
 msgstr ""
 
-#: setup/doctype/company/company.py:364
+#: setup/doctype/company/company.py:356
 msgid "Human Resources"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Hundredweight (UK)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Hundredweight (US)"
+msgstr ""
+
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:260
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:184
 msgid "I - J"
@@ -31702,7 +32247,7 @@
 msgstr ""
 
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:71
-#: manufacturing/report/production_planning_report/production_planning_report.py:347
+#: manufacturing/report/production_planning_report/production_planning_report.py:350
 msgid "ID"
 msgstr ""
 
@@ -31753,12 +32298,17 @@
 msgid "ISSN"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Iches Of Water"
+msgstr ""
+
 #: manufacturing/report/job_card_summary/job_card_summary.py:128
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:69
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:105
 #: manufacturing/report/work_order_summary/work_order_summary.py:192
 #: stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.py:83
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:123
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:121
 msgid "Id"
 msgstr ""
 
@@ -31768,7 +32318,7 @@
 msgid "Identification of the package for the delivery (for print)"
 msgstr ""
 
-#: setup/setup_wizard/operations/install_fixtures.py:393
+#: setup/setup_wizard/operations/install_fixtures.py:385
 msgid "Identifying Decision Makers"
 msgstr ""
 
@@ -31948,7 +32498,7 @@
 msgid "If more than one package of the same type (for print)"
 msgstr ""
 
-#: stock/stock_ledger.py:1699
+#: stock/stock_ledger.py:1671
 msgid "If not, you can Cancel / Submit this entry"
 msgstr ""
 
@@ -31976,7 +32526,7 @@
 msgid "If the account is frozen, entries are allowed to restricted users."
 msgstr ""
 
-#: stock/stock_ledger.py:1692
+#: stock/stock_ledger.py:1664
 msgid "If the item is transacting as a Zero Valuation Rate item in this entry, please enable 'Allow Zero Valuation Rate' in the {0} Item table."
 msgstr ""
 
@@ -32026,7 +32576,7 @@
 msgid "If this is unchecked, direct GL entries will be created to book deferred revenue or expense"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:647
+#: accounts/doctype/payment_entry/payment_entry.py:659
 msgid "If this is undesirable please cancel the corresponding Payment Entry."
 msgstr ""
 
@@ -32074,19 +32624,19 @@
 msgid "If you need to reconcile particular transactions against each other, then please select accordingly. If not, all the transactions will be allocated in FIFO order."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:920
+#: manufacturing/doctype/production_plan/production_plan.py:921
 msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:1625
+#: manufacturing/doctype/production_plan/production_plan.py:1619
 msgid "If you still want to proceed, please enable {0}."
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:375
+#: accounts/doctype/pricing_rule/utils.py:368
 msgid "If you {0} {1} quantities of the item {2}, the scheme {3} will be applied on the item."
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:380
+#: accounts/doctype/pricing_rule/utils.py:373
 msgid "If you {0} {1} worth item {2}, the scheme {3} will be applied on the item."
 msgstr ""
 
@@ -32159,7 +32709,7 @@
 msgid "Ignore Existing Ordered Qty"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:1617
+#: manufacturing/doctype/production_plan/production_plan.py:1611
 msgid "Ignore Existing Projected Quantity"
 msgstr ""
 
@@ -32663,11 +33213,11 @@
 msgid "Import in Bulk"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.py:404
+#: erpnext_integrations/doctype/tally_migration/tally_migration.py:410
 msgid "Importing Items and UOMs"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.py:401
+#: erpnext_integrations/doctype/tally_migration/tally_migration.py:407
 msgid "Importing Parties and Addresses"
 msgstr ""
 
@@ -32822,7 +33372,7 @@
 msgstr ""
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:80
-#: stock/report/stock_balance/stock_balance.py:441
+#: stock/report/stock_balance/stock_balance.py:440
 #: stock/report/stock_ledger/stock_ledger.py:212
 msgid "In Qty"
 msgstr ""
@@ -32862,7 +33412,7 @@
 msgid "In Transit Warehouse"
 msgstr ""
 
-#: stock/report/stock_balance/stock_balance.py:447
+#: stock/report/stock_balance/stock_balance.py:446
 msgid "In Value"
 msgstr ""
 
@@ -33118,6 +33668,31 @@
 msgid "Incentives"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Inch"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Inch Pound-Force"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Inch/Minute"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Inch/Second"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Inches Of Mercury"
+msgstr ""
+
 #: accounts/report/payment_ledger/payment_ledger.js:76
 msgid "Include Account Currency"
 msgstr ""
@@ -33137,6 +33712,7 @@
 #: accounts/report/cash_flow/cash_flow.js:16
 #: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131
 #: accounts/report/general_ledger/general_ledger.js:183
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:30
 #: accounts/report/trial_balance/trial_balance.js:104
 msgid "Include Default FB Entries"
 msgstr ""
@@ -33285,8 +33861,8 @@
 msgid "Include in gross"
 msgstr ""
 
-#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py:76
-#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py:77
+#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py:74
+#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py:75
 msgid "Included in Gross Profit"
 msgstr ""
 
@@ -33300,7 +33876,7 @@
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:78
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:105
 #: accounts/report/account_balance/account_balance.js:27
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:172
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:170
 #: accounts/report/profitability_analysis/profitability_analysis.py:182
 #: public/js/financial_statements.js:36
 msgid "Income"
@@ -33327,7 +33903,7 @@
 
 #: accounts/report/account_balance/account_balance.js:53
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:65
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:293
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:298
 msgid "Income Account"
 msgstr ""
 
@@ -33370,7 +33946,7 @@
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:30
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:31
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:64
-#: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:177
+#: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:175
 msgid "Incoming"
 msgstr ""
 
@@ -33397,7 +33973,7 @@
 msgid "Incoming Call Settings"
 msgstr ""
 
-#: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:163
+#: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161
 #: stock/report/stock_ledger/stock_ledger.py:262
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:170
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:94
@@ -33443,11 +34019,11 @@
 msgid "Incorrect Balance Qty After Transaction"
 msgstr ""
 
-#: controllers/subcontracting_controller.py:714
+#: controllers/subcontracting_controller.py:787
 msgid "Incorrect Batch Consumed"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:280
+#: assets/doctype/asset/asset.py:278
 #: assets/doctype/asset_value_adjustment/asset_value_adjustment.py:74
 msgid "Incorrect Date"
 msgstr ""
@@ -33456,8 +34032,8 @@
 msgid "Incorrect Invoice"
 msgstr ""
 
-#: assets/doctype/asset_movement/asset_movement.py:68
-#: assets/doctype/asset_movement/asset_movement.py:79
+#: assets/doctype/asset_movement/asset_movement.py:70
+#: assets/doctype/asset_movement/asset_movement.py:81
 msgid "Incorrect Movement Purpose"
 msgstr ""
 
@@ -33474,7 +34050,7 @@
 msgid "Incorrect Serial No Valuation"
 msgstr ""
 
-#: controllers/subcontracting_controller.py:727
+#: controllers/subcontracting_controller.py:800
 msgid "Incorrect Serial Number Consumed"
 msgstr ""
 
@@ -33483,7 +34059,7 @@
 msgid "Incorrect Stock Value Report"
 msgstr ""
 
-#: stock/serial_batch_bundle.py:96
+#: stock/serial_batch_bundle.py:95
 msgid "Incorrect Type of Transaction"
 msgstr ""
 
@@ -33582,7 +34158,7 @@
 msgid "Increment cannot be 0"
 msgstr ""
 
-#: controllers/item_variant.py:114
+#: controllers/item_variant.py:112
 msgid "Increment for Attribute {0} cannot be 0"
 msgstr ""
 
@@ -33642,11 +34218,11 @@
 msgid "Individual"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:290
+#: accounts/doctype/gl_entry/gl_entry.py:293
 msgid "Individual GL Entry cannot be cancelled."
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:337
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:341
 msgid "Individual Stock Ledger Entry cannot be cancelled."
 msgstr ""
 
@@ -33739,11 +34315,11 @@
 msgid "Inspected By"
 msgstr ""
 
-#: controllers/stock_controller.py:849
+#: controllers/stock_controller.py:875
 msgid "Inspection Rejected"
 msgstr ""
 
-#: controllers/stock_controller.py:819 controllers/stock_controller.py:821
+#: controllers/stock_controller.py:849 controllers/stock_controller.py:851
 msgid "Inspection Required"
 msgstr ""
 
@@ -33765,7 +34341,7 @@
 msgid "Inspection Required before Purchase"
 msgstr ""
 
-#: controllers/stock_controller.py:836
+#: controllers/stock_controller.py:862
 msgid "Inspection Submission"
 msgstr ""
 
@@ -33804,7 +34380,7 @@
 msgid "Installation Note Item"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:749
+#: stock/doctype/delivery_note/delivery_note.py:764
 msgid "Installation Note {0} has already been submitted"
 msgstr ""
 
@@ -33820,7 +34396,7 @@
 msgid "Installation Time"
 msgstr ""
 
-#: selling/doctype/installation_note/installation_note.py:114
+#: selling/doctype/installation_note/installation_note.py:115
 msgid "Installation date cannot be before delivery date for Item {0}"
 msgstr ""
 
@@ -33865,23 +34441,23 @@
 msgstr ""
 
 #: stock/doctype/putaway_rule/putaway_rule.py:81
-#: stock/doctype/putaway_rule/putaway_rule.py:316
+#: stock/doctype/putaway_rule/putaway_rule.py:308
 msgid "Insufficient Capacity"
 msgstr ""
 
-#: controllers/accounts_controller.py:3221
-#: controllers/accounts_controller.py:3245
+#: controllers/accounts_controller.py:3185
+#: controllers/accounts_controller.py:3209
 msgid "Insufficient Permissions"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:776
+#: stock/doctype/pick_list/pick_list.py:769
 #: stock/doctype/stock_entry/stock_entry.py:731
-#: stock/serial_batch_bundle.py:899 stock/stock_ledger.py:1395
-#: stock/stock_ledger.py:1847
+#: stock/serial_batch_bundle.py:890 stock/stock_ledger.py:1375
+#: stock/stock_ledger.py:1817
 msgid "Insufficient Stock"
 msgstr ""
 
-#: stock/stock_ledger.py:1862
+#: stock/stock_ledger.py:1832
 msgid "Insufficient Stock for Batch"
 msgstr ""
 
@@ -34022,7 +34598,7 @@
 msgid "Interest"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:2364
+#: accounts/doctype/payment_entry/payment_entry.py:2370
 msgid "Interest and/or dunning fee"
 msgstr ""
 
@@ -34046,15 +34622,15 @@
 msgid "Internal Customer"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:218
+#: selling/doctype/customer/customer.py:217
 msgid "Internal Customer for company {0} already exists"
 msgstr ""
 
-#: controllers/accounts_controller.py:577
+#: controllers/accounts_controller.py:586
 msgid "Internal Sale or Delivery Reference missing."
 msgstr ""
 
-#: controllers/accounts_controller.py:579
+#: controllers/accounts_controller.py:588
 msgid "Internal Sales Reference Missing"
 msgstr ""
 
@@ -34064,7 +34640,7 @@
 msgid "Internal Supplier"
 msgstr ""
 
-#: buying/doctype/supplier/supplier.py:178
+#: buying/doctype/supplier/supplier.py:175
 msgid "Internal Supplier for company {0} already exists"
 msgstr ""
 
@@ -34103,7 +34679,7 @@
 msgid "Internal Transfer"
 msgstr ""
 
-#: controllers/accounts_controller.py:588
+#: controllers/accounts_controller.py:597
 msgid "Internal Transfer Reference Missing"
 msgstr ""
 
@@ -34117,7 +34693,7 @@
 msgid "Internal Work History"
 msgstr ""
 
-#: controllers/stock_controller.py:918
+#: controllers/stock_controller.py:942
 msgid "Internal transfers can only be done in company's default currency"
 msgstr ""
 
@@ -34147,35 +34723,35 @@
 msgid "Introduction to Stock Entry"
 msgstr ""
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:325
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:324
 #: stock/doctype/putaway_rule/putaway_rule.py:85
 msgid "Invalid"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:373
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:381
-#: accounts/doctype/sales_invoice/sales_invoice.py:893
-#: accounts/doctype/sales_invoice/sales_invoice.py:903
-#: assets/doctype/asset_category/asset_category.py:68
-#: assets/doctype/asset_category/asset_category.py:96
-#: controllers/accounts_controller.py:2616
-#: controllers/accounts_controller.py:2622
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:372
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:380
+#: accounts/doctype/sales_invoice/sales_invoice.py:886
+#: accounts/doctype/sales_invoice/sales_invoice.py:896
+#: assets/doctype/asset_category/asset_category.py:70
+#: assets/doctype/asset_category/asset_category.py:98
+#: controllers/accounts_controller.py:2591
+#: controllers/accounts_controller.py:2597
 msgid "Invalid Account"
 msgstr ""
 
-#: controllers/item_variant.py:129
+#: controllers/item_variant.py:127
 msgid "Invalid Attribute"
 msgstr ""
 
-#: controllers/accounts_controller.py:424
+#: controllers/accounts_controller.py:423
 msgid "Invalid Auto Repeat Date"
 msgstr ""
 
-#: stock/doctype/quick_stock_balance/quick_stock_balance.py:42
+#: stock/doctype/quick_stock_balance/quick_stock_balance.py:40
 msgid "Invalid Barcode. There is no Item attached to this barcode."
 msgstr ""
 
-#: public/js/controllers/transaction.js:2413
+#: public/js/controllers/transaction.js:2414
 msgid "Invalid Blanket Order for the selected Customer and Item"
 msgstr ""
 
@@ -34183,12 +34759,12 @@
 msgid "Invalid Child Procedure"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1946
+#: accounts/doctype/sales_invoice/sales_invoice.py:1958
 msgid "Invalid Company for Inter Company Transaction."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:251 assets/doctype/asset/asset.py:258
-#: controllers/accounts_controller.py:2637
+#: assets/doctype/asset/asset.py:249 assets/doctype/asset/asset.py:256
+#: controllers/accounts_controller.py:2612
 msgid "Invalid Cost Center"
 msgstr ""
 
@@ -34196,41 +34772,41 @@
 msgid "Invalid Credentials"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:321
+#: selling/doctype/sales_order/sales_order.py:326
 msgid "Invalid Delivery Date"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:109
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:107
 msgid "Invalid Document"
 msgstr ""
 
-#: support/doctype/service_level_agreement/service_level_agreement.py:196
+#: support/doctype/service_level_agreement/service_level_agreement.py:200
 msgid "Invalid Document Type"
 msgstr ""
 
-#: stock/doctype/quality_inspection/quality_inspection.py:231
-#: stock/doctype/quality_inspection/quality_inspection.py:236
+#: stock/doctype/quality_inspection/quality_inspection.py:229
+#: stock/doctype/quality_inspection/quality_inspection.py:234
 msgid "Invalid Formula"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:369
+#: assets/doctype/asset/asset.py:365
 msgid "Invalid Gross Purchase Amount"
 msgstr ""
 
-#: selling/report/lost_quotations/lost_quotations.py:67
+#: selling/report/lost_quotations/lost_quotations.py:65
 msgid "Invalid Group By"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.py:374
+#: accounts/doctype/pos_invoice/pos_invoice.py:376
 msgid "Invalid Item"
 msgstr ""
 
-#: stock/doctype/item/item.py:1372
+#: stock/doctype/item/item.py:1356
 msgid "Invalid Item Defaults"
 msgstr ""
 
 #: accounts/doctype/pos_closing_entry/pos_closing_entry.py:59
-#: accounts/general_ledger.py:686
+#: accounts/general_ledger.py:676
 msgid "Invalid Opening Entry"
 msgstr ""
 
@@ -34238,7 +34814,7 @@
 msgid "Invalid POS Invoices"
 msgstr ""
 
-#: accounts/doctype/account/account.py:339
+#: accounts/doctype/account/account.py:335
 msgid "Invalid Parent Account"
 msgstr ""
 
@@ -34258,24 +34834,24 @@
 msgid "Invalid Priority"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:991
+#: manufacturing/doctype/bom/bom.py:986
 msgid "Invalid Process Loss Configuration"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:608
+#: accounts/doctype/payment_entry/payment_entry.py:618
 msgid "Invalid Purchase Invoice"
 msgstr ""
 
-#: controllers/accounts_controller.py:3260
+#: controllers/accounts_controller.py:3222
 msgid "Invalid Qty"
 msgstr ""
 
-#: controllers/accounts_controller.py:1085
+#: controllers/accounts_controller.py:1097
 msgid "Invalid Quantity"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:413 assets/doctype/asset/asset.py:419
-#: assets/doctype/asset/asset.py:446
+#: assets/doctype/asset/asset.py:409 assets/doctype/asset/asset.py:416
+#: assets/doctype/asset/asset.py:443
 msgid "Invalid Schedule"
 msgstr ""
 
@@ -34287,7 +34863,7 @@
 msgid "Invalid URL"
 msgstr ""
 
-#: controllers/item_variant.py:148
+#: controllers/item_variant.py:144
 msgid "Invalid Value"
 msgstr ""
 
@@ -34300,38 +34876,38 @@
 msgid "Invalid condition expression"
 msgstr ""
 
-#: selling/doctype/quotation/quotation.py:253
+#: selling/doctype/quotation/quotation.py:254
 msgid "Invalid lost reason {0}, please create a new lost reason"
 msgstr ""
 
-#: stock/doctype/item/item.py:402
+#: stock/doctype/item/item.py:401
 msgid "Invalid naming series (. missing) for {0}"
 msgstr ""
 
-#: utilities/transaction_base.py:67
+#: utilities/transaction_base.py:65
 msgid "Invalid reference {0} {1}"
 msgstr ""
 
-#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:102
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:99
 msgid "Invalid result key. Response:"
 msgstr ""
 
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:110
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:120
-#: accounts/general_ledger.py:731 accounts/general_ledger.py:741
+#: accounts/general_ledger.py:719 accounts/general_ledger.py:729
 msgid "Invalid value {0} for {1} against account {2}"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:202 assets/doctype/asset/asset.js:642
+#: accounts/doctype/pricing_rule/utils.py:196 assets/doctype/asset/asset.js:642
 msgid "Invalid {0}"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1944
+#: accounts/doctype/sales_invoice/sales_invoice.py:1956
 msgid "Invalid {0} for Inter Company Transaction."
 msgstr ""
 
 #: accounts/report/general_ledger/general_ledger.py:100
-#: controllers/sales_and_purchase_return.py:32
+#: controllers/sales_and_purchase_return.py:31
 msgid "Invalid {0}: {1}"
 msgstr ""
 
@@ -34366,7 +34942,7 @@
 msgid "Investments"
 msgstr ""
 
-#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:177
+#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:176
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:194
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:100
 msgid "Invoice"
@@ -34415,7 +34991,7 @@
 msgid "Invoice Discounting"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1073
+#: accounts/report/accounts_receivable/accounts_receivable.py:1063
 msgid "Invoice Grand Total"
 msgstr ""
 
@@ -34528,7 +35104,7 @@
 msgid "Invoice Type"
 msgstr ""
 
-#: projects/doctype/timesheet/timesheet.py:386
+#: projects/doctype/timesheet/timesheet.py:382
 msgid "Invoice already created for all billing hours"
 msgstr ""
 
@@ -34538,23 +35114,23 @@
 msgid "Invoice and Billing"
 msgstr ""
 
-#: projects/doctype/timesheet/timesheet.py:383
+#: projects/doctype/timesheet/timesheet.py:379
 msgid "Invoice can't be made for zero billing hour"
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:168
 #: accounts/report/accounts_receivable/accounts_receivable.html:144
-#: accounts/report/accounts_receivable/accounts_receivable.py:1075
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:168
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.py:104
+#: accounts/report/accounts_receivable/accounts_receivable.py:1065
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:166
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.py:102
 msgid "Invoiced Amount"
 msgstr ""
 
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:77
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:75
 msgid "Invoiced Qty"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1997
+#: accounts/doctype/sales_invoice/sales_invoice.py:2007
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
 msgid "Invoices"
 msgstr ""
@@ -35286,7 +35862,7 @@
 msgstr ""
 
 #: accounts/report/pos_register/pos_register.js:63
-#: accounts/report/pos_register/pos_register.py:226
+#: accounts/report/pos_register/pos_register.py:220
 msgid "Is Return"
 msgstr ""
 
@@ -35507,9 +36083,9 @@
 #. Name of a DocType
 #: support/doctype/issue_priority/issue_priority.json
 #: support/report/issue_analytics/issue_analytics.js:63
-#: support/report/issue_analytics/issue_analytics.py:64
+#: support/report/issue_analytics/issue_analytics.py:70
 #: support/report/issue_summary/issue_summary.js:51
-#: support/report/issue_summary/issue_summary.py:61
+#: support/report/issue_summary/issue_summary.py:67
 msgid "Issue Priority"
 msgstr ""
 
@@ -35532,8 +36108,8 @@
 
 #. Name of a DocType
 #: support/doctype/issue_type/issue_type.json
-#: support/report/issue_analytics/issue_analytics.py:53
-#: support/report/issue_summary/issue_summary.py:50
+#: support/report/issue_analytics/issue_analytics.py:59
+#: support/report/issue_summary/issue_summary.py:56
 msgid "Issue Type"
 msgstr ""
 
@@ -35600,15 +36176,15 @@
 msgid "Issuing Date"
 msgstr ""
 
-#: assets/doctype/asset_movement/asset_movement.py:65
+#: assets/doctype/asset_movement/asset_movement.py:67
 msgid "Issuing cannot be done to a location. Please enter employee to issue the Asset {0} to"
 msgstr ""
 
-#: stock/doctype/item/item.py:537
+#: stock/doctype/item/item.py:538
 msgid "It can take upto few hours for accurate stock values to be visible after merging items."
 msgstr ""
 
-#: public/js/controllers/transaction.js:1882
+#: public/js/controllers/transaction.js:1883
 msgid "It is needed to fetch Item Details."
 msgstr ""
 
@@ -35623,17 +36199,17 @@
 #: buying/report/procurement_tracker/procurement_tracker.py:60
 #: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:49
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:206
-#: controllers/taxes_and_totals.py:1019
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202
+#: controllers/taxes_and_totals.py:1026
 #: manufacturing/doctype/plant_floor/plant_floor.js:81
 #: manufacturing/doctype/workstation/workstation_job_card.html:91
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:51
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:49
 #: manufacturing/report/bom_stock_report/bom_stock_report.html:9
 #: manufacturing/report/bom_stock_report/bom_stock_report.html:19
 #: manufacturing/report/bom_stock_report/bom_stock_report.py:25
 #: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:68
 #: manufacturing/report/process_loss_report/process_loss_report.js:15
-#: manufacturing/report/process_loss_report/process_loss_report.py:75
+#: manufacturing/report/process_loss_report/process_loss_report.py:74
 #: public/js/bom_configurator/bom_configurator.bundle.js:170
 #: public/js/bom_configurator/bom_configurator.bundle.js:208
 #: public/js/bom_configurator/bom_configurator.bundle.js:295
@@ -35646,7 +36222,7 @@
 #: selling/report/item_wise_sales_history/item_wise_sales_history.js:36
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:61
 #: stock/dashboard/item_dashboard.js:216 stock/doctype/item/item.json
-#: stock/doctype/putaway_rule/putaway_rule.py:313
+#: stock/doctype/putaway_rule/putaway_rule.py:306
 #: stock/page/stock_balance/stock_balance.js:23
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:36
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:7
@@ -35657,7 +36233,7 @@
 #: stock/report/item_prices/item_prices.py:50
 #: stock/report/item_shortage_report/item_shortage_report.py:88
 #: stock/report/item_variant_details/item_variant_details.js:10
-#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:55
+#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53
 #: stock/report/product_bundle_balance/product_bundle_balance.js:16
 #: stock/report/product_bundle_balance/product_bundle_balance.py:82
 #: stock/report/reserved_stock/reserved_stock.js:30
@@ -35665,16 +36241,16 @@
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:28
 #: stock/report/stock_ageing/stock_ageing.js:37
 #: stock/report/stock_analytics/stock_analytics.js:15
-#: stock/report/stock_analytics/stock_analytics.py:30
+#: stock/report/stock_analytics/stock_analytics.py:29
 #: stock/report/stock_balance/stock_balance.js:39
-#: stock/report/stock_balance/stock_balance.py:369
+#: stock/report/stock_balance/stock_balance.py:368
 #: stock/report/stock_ledger/stock_ledger.js:42
 #: stock/report/stock_ledger/stock_ledger.py:182
 #: stock/report/stock_ledger_variance/stock_ledger_variance.js:27
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:49
 #: stock/report/stock_projected_qty/stock_projected_qty.js:28
-#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58
-#: stock/report/total_stock_summary/total_stock_summary.py:22
+#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57
+#: stock/report/total_stock_summary/total_stock_summary.py:21
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:31
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:92
 #: templates/emails/reorder_item.html:8
@@ -35878,29 +36454,29 @@
 msgid "Item Cart"
 msgstr ""
 
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:69
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:67
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:36
-#: accounts/report/gross_profit/gross_profit.py:224
-#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:150
+#: accounts/report/gross_profit/gross_profit.py:222
+#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:149
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:167
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:36
-#: buying/report/purchase_order_analysis/purchase_order_analysis.py:193
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:200
+#: buying/report/purchase_order_analysis/purchase_order_analysis.py:189
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:198
 #: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.py:36
 #: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:155
 #: manufacturing/report/bom_explorer/bom_explorer.py:49
 #: manufacturing/report/bom_operations_time/bom_operations_time.js:8
 #: manufacturing/report/bom_operations_time/bom_operations_time.py:103
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:102
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:100
 #: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:75
 #: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py:166
-#: manufacturing/report/production_planning_report/production_planning_report.py:349
+#: manufacturing/report/production_planning_report/production_planning_report.py:352
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:27
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:86
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:119
 #: projects/doctype/timesheet/timesheet.js:213
-#: public/js/controllers/transaction.js:2155 public/js/utils.js:511
-#: public/js/utils.js:666 selling/doctype/quotation/quotation.js:280
+#: public/js/controllers/transaction.js:2156 public/js/utils.js:509
+#: public/js/utils.js:664 selling/doctype/quotation/quotation.js:280
 #: selling/doctype/sales_order/sales_order.js:318
 #: selling/doctype/sales_order/sales_order.js:422
 #: selling/doctype/sales_order/sales_order.js:784
@@ -35913,16 +36489,16 @@
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:87
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.js:32
 #: stock/report/delayed_item_report/delayed_item_report.py:143
-#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:120
+#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:119
 #: stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js:15
 #: stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.py:105
 #: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:7
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:146
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:119
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:144
+#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:115
 #: stock/report/item_price_stock/item_price_stock.py:18
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:127
 #: stock/report/serial_no_ledger/serial_no_ledger.js:7
-#: stock/report/stock_ageing/stock_ageing.py:119
+#: stock/report/stock_ageing/stock_ageing.py:118
 #: stock/report/stock_projected_qty/stock_projected_qty.py:99
 #: stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:26
 #: templates/includes/products_as_list.html:14
@@ -36317,11 +36893,11 @@
 msgid "Item Code (Final Product)"
 msgstr ""
 
-#: stock/doctype/serial_no/serial_no.py:83
+#: stock/doctype/serial_no/serial_no.py:80
 msgid "Item Code cannot be changed for Serial No."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:448
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:447
 msgid "Item Code required at Row No {0}"
 msgstr ""
 
@@ -36407,11 +36983,11 @@
 
 #. Name of a DocType
 #: accounts/report/gross_profit/gross_profit.js:44
-#: accounts/report/gross_profit/gross_profit.py:237
+#: accounts/report/gross_profit/gross_profit.py:235
 #: accounts/report/inactive_sales_items/inactive_sales_items.js:21
 #: accounts/report/inactive_sales_items/inactive_sales_items.py:28
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:28
-#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:164
+#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:163
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:53
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:181
 #: accounts/report/purchase_register/purchase_register.js:58
@@ -36430,19 +37006,19 @@
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:94
 #: setup/doctype/item_group/item_group.json
 #: stock/page/stock_balance/stock_balance.js:35
-#: stock/report/cogs_by_item_group/cogs_by_item_group.py:44
+#: stock/report/cogs_by_item_group/cogs_by_item_group.py:43
 #: stock/report/delayed_item_report/delayed_item_report.js:48
 #: stock/report/delayed_order_report/delayed_order_report.js:48
 #: stock/report/item_prices/item_prices.py:52
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js:20
-#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:57
+#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:55
 #: stock/report/product_bundle_balance/product_bundle_balance.js:29
 #: stock/report/product_bundle_balance/product_bundle_balance.py:100
-#: stock/report/stock_ageing/stock_ageing.py:128
+#: stock/report/stock_ageing/stock_ageing.py:127
 #: stock/report/stock_analytics/stock_analytics.js:8
-#: stock/report/stock_analytics/stock_analytics.py:39
+#: stock/report/stock_analytics/stock_analytics.py:38
 #: stock/report/stock_balance/stock_balance.js:32
-#: stock/report/stock_balance/stock_balance.py:377
+#: stock/report/stock_balance/stock_balance.py:376
 #: stock/report/stock_ledger/stock_ledger.js:53
 #: stock/report/stock_ledger/stock_ledger.py:247
 #: stock/report/stock_projected_qty/stock_projected_qty.js:39
@@ -36671,7 +37247,7 @@
 msgid "Item Group Tree"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/pricing_rule.py:503
+#: accounts/doctype/pricing_rule/pricing_rule.py:505
 msgid "Item Group not mentioned in item master for item {0}"
 msgstr ""
 
@@ -36725,25 +37301,25 @@
 msgid "Item Manufacturer"
 msgstr ""
 
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:75
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:73
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:70
-#: accounts/report/gross_profit/gross_profit.py:231
+#: accounts/report/gross_profit/gross_profit.py:229
 #: accounts/report/inactive_sales_items/inactive_sales_items.py:33
-#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:156
+#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:155
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:173
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:70
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:206
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:204
 #: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:101
 #: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:8
 #: manufacturing/report/bom_explorer/bom_explorer.py:55
 #: manufacturing/report/bom_operations_time/bom_operations_time.py:109
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:108
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:106
 #: manufacturing/report/job_card_summary/job_card_summary.py:158
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:125
-#: manufacturing/report/production_planning_report/production_planning_report.py:356
+#: manufacturing/report/production_planning_report/production_planning_report.py:359
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:92
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:128
-#: public/js/controllers/transaction.js:2161
+#: public/js/controllers/transaction.js:2162
 #: selling/report/customer_wise_item_price/customer_wise_item_price.py:35
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:33
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:25
@@ -36753,15 +37329,15 @@
 #: stock/report/item_price_stock/item_price_stock.py:24
 #: stock/report/item_prices/item_prices.py:51
 #: stock/report/item_shortage_report/item_shortage_report.py:143
-#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:56
+#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133
-#: stock/report/stock_ageing/stock_ageing.py:125
-#: stock/report/stock_analytics/stock_analytics.py:32
-#: stock/report/stock_balance/stock_balance.py:375
+#: stock/report/stock_ageing/stock_ageing.py:124
+#: stock/report/stock_analytics/stock_analytics.py:31
+#: stock/report/stock_balance/stock_balance.py:374
 #: stock/report/stock_ledger/stock_ledger.py:188
 #: stock/report/stock_projected_qty/stock_projected_qty.py:105
 #: stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32
-#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:59
+#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:93
 msgid "Item Name"
 msgstr ""
@@ -37141,15 +37717,15 @@
 msgid "Item Price Stock"
 msgstr ""
 
-#: stock/get_item_details.py:889
+#: stock/get_item_details.py:862
 msgid "Item Price added for {0} in Price List {1}"
 msgstr ""
 
-#: stock/doctype/item_price/item_price.py:136
+#: stock/doctype/item_price/item_price.py:140
 msgid "Item Price appears multiple times based on Price List, Supplier/Customer, Currency, Item, Batch, UOM, Qty, and Dates."
 msgstr ""
 
-#: stock/get_item_details.py:873
+#: stock/get_item_details.py:844
 msgid "Item Price updated for {0} in Price List {1}"
 msgstr ""
 
@@ -37384,8 +37960,8 @@
 msgid "Item UOM"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.py:341
-#: accounts/doctype/pos_invoice/pos_invoice.py:348
+#: accounts/doctype/pos_invoice/pos_invoice.py:343
+#: accounts/doctype/pos_invoice/pos_invoice.py:350
 msgid "Item Unavailable"
 msgstr ""
 
@@ -37422,7 +37998,7 @@
 msgid "Item Variant {0} already exists with same attributes"
 msgstr ""
 
-#: stock/doctype/item/item.py:762
+#: stock/doctype/item/item.py:754
 msgid "Item Variants updated"
 msgstr ""
 
@@ -37513,11 +38089,11 @@
 msgid "Item and Warranty Details"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2359
+#: stock/doctype/stock_entry/stock_entry.py:2389
 msgid "Item for row {0} does not match Material Request"
 msgstr ""
 
-#: stock/doctype/item/item.py:776
+#: stock/doctype/item/item.py:768
 msgid "Item has variants."
 msgstr ""
 
@@ -37540,11 +38116,11 @@
 msgid "Item operation"
 msgstr ""
 
-#: controllers/accounts_controller.py:3287
+#: controllers/accounts_controller.py:3245
 msgid "Item qty can not be updated as raw materials are already processed."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:813
+#: stock/doctype/stock_entry/stock_entry.py:811
 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}"
 msgstr ""
 
@@ -37558,11 +38134,11 @@
 msgid "Item valuation rate is recalculated considering landed cost voucher amount"
 msgstr ""
 
-#: stock/utils.py:559
+#: stock/utils.py:544
 msgid "Item valuation reposting in progress. Report might show incorrect item valuation."
 msgstr ""
 
-#: stock/doctype/item/item.py:933
+#: stock/doctype/item/item.py:921
 msgid "Item variant {0} exists with same attributes"
 msgstr ""
 
@@ -37574,79 +38150,79 @@
 msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:233 stock/doctype/item/item.py:603
+#: assets/doctype/asset/asset.py:231 stock/doctype/item/item.py:603
 msgid "Item {0} does not exist"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:560
+#: manufacturing/doctype/bom/bom.py:555
 msgid "Item {0} does not exist in the system or has expired"
 msgstr ""
 
-#: controllers/selling_controller.py:679
+#: controllers/selling_controller.py:684
 msgid "Item {0} entered multiple times."
 msgstr ""
 
-#: controllers/sales_and_purchase_return.py:177
+#: controllers/sales_and_purchase_return.py:175
 msgid "Item {0} has already been returned"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:235
+#: assets/doctype/asset/asset.py:233
 msgid "Item {0} has been disabled"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:651
+#: selling/doctype/sales_order/sales_order.py:657
 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No"
 msgstr ""
 
-#: stock/doctype/item/item.py:1102
+#: stock/doctype/item/item.py:1090
 msgid "Item {0} has reached its end of life on {1}"
 msgstr ""
 
-#: stock/stock_ledger.py:113
+#: stock/stock_ledger.py:112
 msgid "Item {0} ignored since it is not a stock item"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:456
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:450
 msgid "Item {0} is already reserved/delivered against Sales Order {1}."
 msgstr ""
 
-#: stock/doctype/item/item.py:1122
+#: stock/doctype/item/item.py:1110
 msgid "Item {0} is cancelled"
 msgstr ""
 
-#: stock/doctype/item/item.py:1106
+#: stock/doctype/item/item.py:1094
 msgid "Item {0} is disabled"
 msgstr ""
 
-#: selling/doctype/installation_note/installation_note.py:78
+#: selling/doctype/installation_note/installation_note.py:79
 msgid "Item {0} is not a serialized Item"
 msgstr ""
 
-#: stock/doctype/item/item.py:1114
+#: stock/doctype/item/item.py:1102
 msgid "Item {0} is not a stock Item"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1547
+#: stock/doctype/stock_entry/stock_entry.py:1564
 msgid "Item {0} is not active or end of life has been reached"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:237
+#: assets/doctype/asset/asset.py:235
 msgid "Item {0} must be a Fixed Asset Item"
 msgstr ""
 
-#: stock/get_item_details.py:233
+#: stock/get_item_details.py:228
 msgid "Item {0} must be a Non-Stock Item"
 msgstr ""
 
-#: stock/get_item_details.py:230
+#: stock/get_item_details.py:225
 msgid "Item {0} must be a Sub-contracted Item"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:239
+#: assets/doctype/asset/asset.py:237
 msgid "Item {0} must be a non-stock item"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1095
+#: stock/doctype/stock_entry/stock_entry.py:1099
 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}"
 msgstr ""
 
@@ -37654,7 +38230,7 @@
 msgid "Item {0} not found."
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:343
+#: buying/doctype/purchase_order/purchase_order.py:341
 msgid "Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item)."
 msgstr ""
 
@@ -37662,7 +38238,7 @@
 msgid "Item {0}: {1} qty produced. "
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1190
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1187
 msgid "Item {} does not exist."
 msgstr ""
 
@@ -37704,11 +38280,11 @@
 msgid "Item-wise Sales Register"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:311
+#: manufacturing/doctype/bom/bom.py:308
 msgid "Item: {0} does not exist in the system"
 msgstr ""
 
-#: public/js/utils.js:489
+#: public/js/utils.js:487
 #: selling/page/point_of_sale/pos_past_order_summary.js:18
 #: setup/doctype/item_group/item_group.js:87
 #: stock/doctype/delivery_note/delivery_note.js:410
@@ -37884,7 +38460,7 @@
 msgid "Items Filter"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:1484
+#: manufacturing/doctype/production_plan/production_plan.py:1475
 #: selling/doctype/sales_order/sales_order.js:1182
 msgid "Items Required"
 msgstr ""
@@ -37901,7 +38477,7 @@
 msgid "Items and Pricing"
 msgstr ""
 
-#: controllers/accounts_controller.py:3507
+#: controllers/accounts_controller.py:3469
 msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}."
 msgstr ""
 
@@ -37909,7 +38485,7 @@
 msgid "Items for Raw Material Request"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:809
+#: stock/doctype/stock_entry/stock_entry.py:807
 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}"
 msgstr ""
 
@@ -37919,7 +38495,7 @@
 msgid "Items to Be Repost"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:1483
+#: manufacturing/doctype/production_plan/production_plan.py:1474
 msgid "Items to Manufacture are required to pull the Raw Materials associated with it."
 msgstr ""
 
@@ -37965,11 +38541,11 @@
 
 #. Name of a DocType
 #: manufacturing/doctype/job_card/job_card.json
-#: manufacturing/doctype/job_card/job_card.py:772
+#: manufacturing/doctype/job_card/job_card.py:765
 #: manufacturing/doctype/work_order/work_order.js:300
 #: manufacturing/doctype/workstation/workstation_job_card.html:23
 #: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:29
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:88
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:86
 msgid "Job Card"
 msgstr ""
 
@@ -38104,11 +38680,11 @@
 msgid "Job Title"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:1576
+#: manufacturing/doctype/work_order/work_order.py:1568
 msgid "Job card {0} created"
 msgstr ""
 
-#: utilities/bulk_transaction.py:52
+#: utilities/bulk_transaction.py:50
 msgid "Job: {0} has been triggered for processing failed transactions"
 msgstr ""
 
@@ -38122,11 +38698,21 @@
 msgid "Joining"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Joule"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Joule/Meter"
+msgstr ""
+
 #: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:30
 msgid "Journal Entries"
 msgstr ""
 
-#: accounts/utils.py:875
+#: accounts/utils.py:859
 msgid "Journal Entries {0} are un-linked"
 msgstr ""
 
@@ -38220,7 +38806,7 @@
 msgid "Journal Entry Type"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:487
+#: accounts/doctype/journal_entry/journal_entry.py:489
 msgid "Journal Entry for Asset scrapping cannot be cancelled. Please restore the Asset."
 msgstr ""
 
@@ -38230,11 +38816,11 @@
 msgid "Journal Entry for Scrap"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:248
+#: accounts/doctype/journal_entry/journal_entry.py:245
 msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:624
+#: accounts/doctype/journal_entry/journal_entry.py:625
 msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
 msgstr ""
 
@@ -38257,6 +38843,11 @@
 msgid "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. "
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Kelvin"
+msgstr ""
+
 #. Label of a Data field in DocType 'Currency Exchange Settings Details'
 #: accounts/doctype/currency_exchange_settings_details/currency_exchange_settings_details.json
 msgctxt "Currency Exchange Settings Details"
@@ -38277,7 +38868,92 @@
 msgid "Key Reports"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:775
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Kg"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Kiloampere"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Kilocalorie"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Kilocoulomb"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Kilogram-Force"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Kilogram/Cubic Centimeter"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Kilogram/Cubic Meter"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Kilogram/Litre"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Kilohertz"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Kilojoule"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Kilometer"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Kilometer/Hour"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Kilopascal"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Kilopond"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Kilopound-Force"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Kilowatt"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Kilowatt-Hour"
+msgstr ""
+
+#: manufacturing/doctype/job_card/job_card.py:767
 msgid "Kindly cancel the Manufacturing Entries first against the work order {0}."
 msgstr ""
 
@@ -38285,6 +38961,16 @@
 msgid "Kindly select the company first"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Kip"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Knot"
+msgstr ""
+
 #. Option for the 'Valuation Method' (Select) field in DocType 'Item'
 #: stock/doctype/item/item.json
 msgctxt "Item"
@@ -38425,16 +39111,16 @@
 msgid "Last Name, Email or Phone/Mobile of the user are mandatory to continue."
 msgstr ""
 
-#: selling/report/inactive_customers/inactive_customers.py:85
+#: selling/report/inactive_customers/inactive_customers.py:81
 msgid "Last Order Amount"
 msgstr ""
 
 #: accounts/report/inactive_sales_items/inactive_sales_items.py:44
-#: selling/report/inactive_customers/inactive_customers.py:86
+#: selling/report/inactive_customers/inactive_customers.py:82
 msgid "Last Order Date"
 msgstr ""
 
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:100
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:98
 #: stock/report/item_prices/item_prices.py:56
 msgid "Last Purchase Rate"
 msgstr ""
@@ -38464,7 +39150,7 @@
 msgid "Last Purchase Rate"
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:324
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:326
 msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}."
 msgstr ""
 
@@ -38472,11 +39158,11 @@
 msgid "Last carbon check date cannot be a future date"
 msgstr ""
 
-#: stock/report/stock_ageing/stock_ageing.py:164
+#: stock/report/stock_ageing/stock_ageing.py:163
 msgid "Latest"
 msgstr ""
 
-#: stock/report/stock_balance/stock_balance.py:487
+#: stock/report/stock_balance/stock_balance.py:486
 msgid "Latest Age"
 msgstr ""
 
@@ -38536,7 +39222,7 @@
 msgid "Lead"
 msgstr ""
 
-#: crm/doctype/lead/lead.py:555
+#: crm/doctype/lead/lead.py:547
 msgid "Lead -> Prospect"
 msgstr ""
 
@@ -38590,7 +39276,7 @@
 msgid "Lead Owner Efficiency"
 msgstr ""
 
-#: crm/doctype/lead/lead.py:176
+#: crm/doctype/lead/lead.py:174
 msgid "Lead Owner cannot be same as the Lead Email Address"
 msgstr ""
 
@@ -38612,7 +39298,7 @@
 msgid "Lead Time"
 msgstr ""
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:268
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:264
 msgid "Lead Time (Days)"
 msgstr ""
 
@@ -38626,7 +39312,7 @@
 msgid "Lead Time Date"
 msgstr ""
 
-#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:61
+#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:59
 msgid "Lead Time Days"
 msgstr ""
 
@@ -38648,7 +39334,7 @@
 msgid "Lead Type"
 msgstr ""
 
-#: crm/doctype/lead/lead.py:552
+#: crm/doctype/lead/lead.py:546
 msgid "Lead {0} has been added to prospect {1}."
 msgstr ""
 
@@ -38668,7 +39354,7 @@
 msgid "Leads"
 msgstr ""
 
-#: utilities/activation.py:79
+#: utilities/activation.py:77
 msgid "Leads help you get business, add all your contacts and more as your leads"
 msgstr ""
 
@@ -38808,7 +39494,7 @@
 msgid "Left Index"
 msgstr ""
 
-#: setup/doctype/company/company.py:388
+#: setup/doctype/company/company.py:380
 msgid "Legal"
 msgstr ""
 
@@ -39159,7 +39845,7 @@
 msgid "Lft"
 msgstr ""
 
-#: accounts/report/balance_sheet/balance_sheet.py:240
+#: accounts/report/balance_sheet/balance_sheet.py:239
 msgid "Liabilities"
 msgstr ""
 
@@ -39208,7 +39894,7 @@
 msgid "Likes"
 msgstr ""
 
-#: controllers/status_updater.py:362
+#: controllers/status_updater.py:358
 msgid "Limit Crossed"
 msgstr ""
 
@@ -39236,6 +39922,11 @@
 msgid "Line spacing for amount in words"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Link"
+msgstr ""
+
 #. Option for the 'Source Type' (Select) field in DocType 'Support Search
 #. Source'
 #: support/doctype/support_search_source/support_search_source.json
@@ -39260,7 +39951,7 @@
 msgid "Link existing Quality Procedure."
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:564
+#: buying/doctype/purchase_order/purchase_order.js:570
 msgid "Link to Material Request"
 msgstr ""
 
@@ -39294,7 +39985,7 @@
 msgid "Linked Location"
 msgstr ""
 
-#: stock/doctype/item/item.py:975
+#: stock/doctype/item/item.py:963
 msgid "Linked with submitted documents"
 msgstr ""
 
@@ -39323,6 +40014,16 @@
 msgid "List items that form the package."
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Litre"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Litre-Atmosphere"
+msgstr ""
+
 #. Label of a Button field in DocType 'Supplier Scorecard'
 #: buying/doctype/supplier_scorecard/supplier_scorecard.json
 msgctxt "Supplier Scorecard"
@@ -39379,7 +40080,7 @@
 #. Name of a DocType
 #: assets/doctype/location/location.json
 #: assets/doctype/location/location_tree.js:10
-#: assets/report/fixed_asset_register/fixed_asset_register.py:476
+#: assets/report/fixed_asset_register/fixed_asset_register.py:466
 msgid "Location"
 msgstr ""
 
@@ -39532,7 +40233,7 @@
 msgstr ""
 
 #: crm/report/lost_opportunity/lost_opportunity.py:49
-#: public/js/utils/sales_common.js:466
+#: public/js/utils/sales_common.js:463
 msgid "Lost Reasons"
 msgstr ""
 
@@ -39590,7 +40291,7 @@
 msgstr ""
 
 #: setup/setup_wizard/operations/install_fixtures.py:262
-#: setup/setup_wizard/operations/install_fixtures.py:378
+#: setup/setup_wizard/operations/install_fixtures.py:370
 msgid "Lower Income"
 msgstr ""
 
@@ -39891,8 +40592,8 @@
 msgid "Machine operator errors"
 msgstr ""
 
-#: setup/doctype/company/company.py:562 setup/doctype/company/company.py:577
-#: setup/doctype/company/company.py:578 setup/doctype/company/company.py:579
+#: setup/doctype/company/company.py:554 setup/doctype/company/company.py:569
+#: setup/doctype/company/company.py:570 setup/doctype/company/company.py:571
 msgid "Main"
 msgstr ""
 
@@ -39902,7 +40603,7 @@
 msgid "Main Cost Center"
 msgstr ""
 
-#: accounts/doctype/cost_center_allocation/cost_center_allocation.py:125
+#: accounts/doctype/cost_center_allocation/cost_center_allocation.py:123
 msgid "Main Cost Center {0} cannot be entered in the child table"
 msgstr ""
 
@@ -40070,11 +40771,11 @@
 msgid "Maintenance Schedule Item"
 msgstr ""
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:370
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:367
 msgid "Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule'"
 msgstr ""
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:248
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:247
 msgid "Maintenance Schedule {0} exists against {1}"
 msgstr ""
 
@@ -40200,7 +40901,7 @@
 msgid "Maintenance Visit Purpose"
 msgstr ""
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:352
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:349
 msgid "Maintenance start date can not be before delivery date for Serial No {0}"
 msgstr ""
 
@@ -40306,11 +41007,11 @@
 msgid "Manage cost of operations"
 msgstr ""
 
-#: utilities/activation.py:96
+#: utilities/activation.py:94
 msgid "Manage your orders"
 msgstr ""
 
-#: setup/doctype/company/company.py:370
+#: setup/doctype/company/company.py:362
 msgid "Management"
 msgstr ""
 
@@ -40318,10 +41019,10 @@
 #: accounts/doctype/promotional_scheme/promotional_scheme.py:143
 #: buying/doctype/supplier_quotation/supplier_quotation.js:65
 #: manufacturing/doctype/bom/bom.js:71 manufacturing/doctype/bom/bom.js:499
-#: manufacturing/doctype/bom/bom.py:245
-#: manufacturing/doctype/bom_update_log/bom_update_log.py:73
+#: manufacturing/doctype/bom/bom.py:242
+#: manufacturing/doctype/bom_update_log/bom_update_log.py:71
 #: public/js/controllers/accounts.js:249
-#: public/js/controllers/transaction.js:2537 public/js/utils/party.js:317
+#: public/js/controllers/transaction.js:2536 public/js/utils/party.js:317
 #: stock/doctype/delivery_note/delivery_note.js:150
 #: stock/doctype/purchase_receipt/purchase_receipt.js:127
 #: stock/doctype/purchase_receipt/purchase_receipt.js:229
@@ -40351,7 +41052,7 @@
 msgid "Mandatory Depends On"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1525
+#: accounts/doctype/sales_invoice/sales_invoice.py:1532
 msgid "Mandatory Field"
 msgstr ""
 
@@ -40367,15 +41068,15 @@
 msgid "Mandatory For Profit and Loss Account"
 msgstr ""
 
-#: selling/doctype/quotation/quotation.py:556
+#: selling/doctype/quotation/quotation.py:551
 msgid "Mandatory Missing"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:587
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:592
 msgid "Mandatory Purchase Order"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:609
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:613
 msgid "Mandatory Purchase Receipt"
 msgstr ""
 
@@ -40543,7 +41244,7 @@
 msgid "Manufactured"
 msgstr ""
 
-#: manufacturing/report/process_loss_report/process_loss_report.py:89
+#: manufacturing/report/process_loss_report/process_loss_report.py:88
 msgid "Manufactured Qty"
 msgstr ""
 
@@ -40554,7 +41255,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:64
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:62
 #: stock/doctype/manufacturer/manufacturer.json
 msgid "Manufacturer"
 msgstr ""
@@ -40619,7 +41320,7 @@
 msgid "Manufacturer"
 msgstr ""
 
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:70
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:68
 msgid "Manufacturer Part Number"
 msgstr ""
 
@@ -40726,7 +41427,7 @@
 msgid "Manufacturing Manager"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1698
+#: stock/doctype/stock_entry/stock_entry.py:1722
 msgid "Manufacturing Quantity is mandatory"
 msgstr ""
 
@@ -40798,7 +41499,7 @@
 msgid "Mapping Subcontracting Order ..."
 msgstr ""
 
-#: public/js/utils.js:913
+#: public/js/utils.js:911
 msgid "Mapping {0} ..."
 msgstr ""
 
@@ -40988,7 +41689,7 @@
 msgid "Market Segment"
 msgstr ""
 
-#: setup/doctype/company/company.py:322
+#: setup/doctype/company/company.py:314
 msgid "Marketing"
 msgstr ""
 
@@ -41044,7 +41745,7 @@
 msgid "Material Consumption for Manufacture"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.js:480
+#: stock/doctype/stock_entry/stock_entry.js:494
 msgid "Material Consumption is not set in Manufacturing Settings."
 msgstr ""
 
@@ -41103,19 +41804,19 @@
 msgstr ""
 
 #. Name of a DocType
-#: buying/doctype/purchase_order/purchase_order.js:504
+#: buying/doctype/purchase_order/purchase_order.js:510
 #: buying/doctype/request_for_quotation/request_for_quotation.js:316
 #: buying/doctype/supplier_quotation/supplier_quotation.js:30
 #: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:33
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:186
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:184
 #: manufacturing/doctype/job_card/job_card.js:54
 #: manufacturing/doctype/production_plan/production_plan.js:135
 #: manufacturing/doctype/workstation/workstation_job_card.html:80
 #: selling/doctype/sales_order/sales_order.js:645
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:36
 #: stock/doctype/material_request/material_request.json
-#: stock/doctype/material_request/material_request.py:365
-#: stock/doctype/material_request/material_request.py:399
+#: stock/doctype/material_request/material_request.py:363
+#: stock/doctype/material_request/material_request.py:395
 #: stock/doctype/stock_entry/stock_entry.js:210
 #: stock/doctype/stock_entry/stock_entry.js:313
 msgid "Material Request"
@@ -41345,7 +42046,7 @@
 msgid "Material Request Type"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:1544
+#: selling/doctype/sales_order/sales_order.py:1533
 msgid "Material Request not created, as quantity for Raw Materials already available."
 msgstr ""
 
@@ -41360,7 +42061,7 @@
 msgid "Material Request used to make this Stock Entry"
 msgstr ""
 
-#: controllers/subcontracting_controller.py:979
+#: controllers/subcontracting_controller.py:1052
 msgid "Material Request {0} is cancelled or stopped"
 msgstr ""
 
@@ -41380,7 +42081,7 @@
 msgid "Material Requests"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:391
+#: manufacturing/doctype/production_plan/production_plan.py:390
 msgid "Material Requests Required"
 msgstr ""
 
@@ -41491,7 +42192,7 @@
 msgid "Material Transferred for Subcontract"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:360
+#: buying/doctype/purchase_order/purchase_order.js:362
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.js:206
 msgid "Material to Supplier"
 msgstr ""
@@ -41502,7 +42203,7 @@
 msgid "Materials Required (Exploded)"
 msgstr ""
 
-#: controllers/subcontracting_controller.py:1169
+#: controllers/subcontracting_controller.py:1251
 msgid "Materials are already received against the {0} {1}"
 msgstr ""
 
@@ -41609,11 +42310,11 @@
 msgid "Maximum Payment Amount"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2878
+#: stock/doctype/stock_entry/stock_entry.py:2910
 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2869
+#: stock/doctype/stock_entry/stock_entry.py:2901
 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}."
 msgstr ""
 
@@ -41677,7 +42378,32 @@
 msgid "Meeting"
 msgstr ""
 
-#: stock/stock_ledger.py:1705
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Megacoulomb"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Megagram/Litre"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Megahertz"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Megajoule"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Megawatt"
+msgstr ""
+
+#: stock/stock_ledger.py:1677
 msgid "Mention Valuation Rate in the Item master."
 msgstr ""
 
@@ -41729,7 +42455,7 @@
 msgid "Merge Similar Account Heads"
 msgstr ""
 
-#: public/js/utils.js:943
+#: public/js/utils.js:941
 msgid "Merge taxes from multiple documents"
 msgstr ""
 
@@ -41747,7 +42473,7 @@
 msgid "Merged"
 msgstr ""
 
-#: accounts/doctype/account/account.py:565
+#: accounts/doctype/account/account.py:560
 msgid "Merging is only possible if following properties are same in both records. Is Group, Root Type, Company and Account Currency"
 msgstr ""
 
@@ -41822,8 +42548,48 @@
 msgid "Meta Data"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Meter"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Meter Of Water"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Meter/Second"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Microbar"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Microgram"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Microgram/Litre"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Micrometer"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Microsecond"
+msgstr ""
+
 #: setup/setup_wizard/operations/install_fixtures.py:263
-#: setup/setup_wizard/operations/install_fixtures.py:379
+#: setup/setup_wizard/operations/install_fixtures.py:371
 msgid "Middle Income"
 msgstr ""
 
@@ -41839,6 +42605,101 @@
 msgid "Middle Name"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Mile"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Mile (Nautical)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Mile/Hour"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Mile/Minute"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Mile/Second"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Milibar"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Milliampere"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Millicoulomb"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Milligram"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Milligram/Cubic Centimeter"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Milligram/Cubic Meter"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Milligram/Cubic Millimeter"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Milligram/Litre"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Millihertz"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Millilitre"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Millimeter"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Millimeter Of Mercury"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Millimeter Of Water"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Millisecond"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Promotional Scheme Price Discount'
 #: accounts/doctype/promotional_scheme_price_discount/promotional_scheme_price_discount.json
 msgctxt "Promotional Scheme Price Discount"
@@ -41967,6 +42828,11 @@
 msgid "Minimum quantity should be as per Stock UOM"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Minute"
+msgstr ""
+
 #. Label of a Text Editor field in DocType 'Quality Meeting Minutes'
 #: quality_management/doctype/quality_meeting_minutes/quality_meeting_minutes.json
 msgctxt "Quality Meeting Minutes"
@@ -41984,44 +42850,44 @@
 msgid "Miscellaneous Expenses"
 msgstr ""
 
-#: controllers/buying_controller.py:473
+#: controllers/buying_controller.py:467
 msgid "Mismatch"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1191
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1188
 msgid "Missing"
 msgstr ""
 
 #: accounts/doctype/pos_opening_entry/pos_opening_entry.py:69
 #: accounts/doctype/pos_profile/pos_profile.py:166
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:552
-#: accounts/doctype/sales_invoice/sales_invoice.py:2013
-#: accounts/doctype/sales_invoice/sales_invoice.py:2571
-#: assets/doctype/asset_category/asset_category.py:115
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:556
+#: accounts/doctype/sales_invoice/sales_invoice.py:2023
+#: accounts/doctype/sales_invoice/sales_invoice.py:2576
+#: assets/doctype/asset_category/asset_category.py:117
 msgid "Missing Account"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1414
+#: accounts/doctype/sales_invoice/sales_invoice.py:1422
 msgid "Missing Asset"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:169 assets/doctype/asset/asset.py:267
+#: accounts/doctype/gl_entry/gl_entry.py:174 assets/doctype/asset/asset.py:265
 msgid "Missing Cost Center"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:311
+#: assets/doctype/asset/asset.py:307
 msgid "Missing Finance Book"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1289
+#: stock/doctype/stock_entry/stock_entry.py:1298
 msgid "Missing Finished Good"
 msgstr ""
 
-#: stock/doctype/quality_inspection/quality_inspection.py:216
+#: stock/doctype/quality_inspection/quality_inspection.py:214
 msgid "Missing Formula"
 msgstr ""
 
-#: assets/doctype/asset_repair/asset_repair.py:173
+#: assets/doctype/asset_repair/asset_repair.py:172
 msgid "Missing Items"
 msgstr ""
 
@@ -42029,15 +42895,15 @@
 msgid "Missing Payments App"
 msgstr ""
 
-#: assets/doctype/asset_repair/asset_repair.py:240
+#: assets/doctype/asset_repair/asset_repair.py:238
 msgid "Missing Serial No Bundle"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:754
+#: selling/doctype/customer/customer.py:743
 msgid "Missing Values Required"
 msgstr ""
 
-#: assets/doctype/asset_repair/asset_repair.py:178
+#: assets/doctype/asset_repair/asset_repair.py:176
 msgid "Missing Warehouse"
 msgstr ""
 
@@ -42045,8 +42911,8 @@
 msgid "Missing email template for dispatch. Please set one in Delivery Settings."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:957
-#: manufacturing/doctype/work_order/work_order.py:993
+#: manufacturing/doctype/bom/bom.py:952
+#: manufacturing/doctype/work_order/work_order.py:990
 msgid "Missing value"
 msgstr ""
 
@@ -42190,10 +43056,10 @@
 msgid "Mobile Number"
 msgstr ""
 
-#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:213
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:243
+#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:217
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:248
 #: accounts/report/purchase_register/purchase_register.py:201
-#: accounts/report/sales_register/sales_register.py:222
+#: accounts/report/sales_register/sales_register.py:223
 msgid "Mode Of Payment"
 msgstr ""
 
@@ -42441,7 +43307,7 @@
 
 #: accounts/report/budget_variance_report/budget_variance_report.js:62
 #: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:75
-#: accounts/report/gross_profit/gross_profit.py:342
+#: accounts/report/gross_profit/gross_profit.py:340
 #: buying/report/purchase_analytics/purchase_analytics.js:61
 #: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:57
 #: manufacturing/report/production_analytics/production_analytics.js:34
@@ -42745,7 +43611,7 @@
 msgid "More Information"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:54
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:52
 msgid "More columns found than expected. Please compare the uploaded file with standard template"
 msgstr ""
 
@@ -42809,11 +43675,11 @@
 msgid "Multi-level BOM Creator"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:381
+#: selling/doctype/customer/customer.py:378
 msgid "Multiple Loyalty Programs found for Customer {}. Please select manually."
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:345
+#: accounts/doctype/pricing_rule/utils.py:338
 msgid "Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}"
 msgstr ""
 
@@ -42828,20 +43694,20 @@
 msgid "Multiple Variants"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse.py:147
+#: stock/doctype/warehouse/warehouse.py:145
 msgid "Multiple Warehouse Accounts"
 msgstr ""
 
-#: controllers/accounts_controller.py:951
+#: controllers/accounts_controller.py:963
 msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1296
+#: stock/doctype/stock_entry/stock_entry.py:1305
 msgid "Multiple items cannot be marked as finished item"
 msgstr ""
 
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:137
-#: utilities/transaction_base.py:222
+#: utilities/transaction_base.py:220
 msgid "Must be Whole Number"
 msgstr ""
 
@@ -42870,8 +43736,8 @@
 msgid "N/A"
 msgstr ""
 
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.py:86
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:357
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.py:84
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:355
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py:29
 #: manufacturing/doctype/bom_creator/bom_creator.js:44
 #: public/js/utils/serial_no_batch_selector.js:413
@@ -43102,25 +43968,50 @@
 msgid "Naming Series and Price Defaults"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Nanocoulomb"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Nanogram/Litre"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Nanohertz"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Nanometer"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Nanosecond"
+msgstr ""
+
 #. Option for the 'Fuel Type' (Select) field in DocType 'Vehicle'
 #: setup/doctype/vehicle/vehicle.json
 msgctxt "Vehicle"
 msgid "Natural Gas"
 msgstr ""
 
-#: setup/setup_wizard/operations/install_fixtures.py:391
+#: setup/setup_wizard/operations/install_fixtures.py:383
 msgid "Needs Analysis"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:431
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:434
 msgid "Negative Quantity is not allowed"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:435
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:439
 msgid "Negative Valuation Rate is not allowed"
 msgstr ""
 
-#: setup/setup_wizard/operations/install_fixtures.py:396
+#: setup/setup_wizard/operations/install_fixtures.py:388
 msgid "Negotiation/Review"
 msgstr ""
 
@@ -43238,45 +44129,45 @@
 msgid "Net Amount (Company Currency)"
 msgstr ""
 
-#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:429
-#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:435
+#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:421
+#: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:427
 msgid "Net Asset value as on"
 msgstr ""
 
-#: accounts/report/cash_flow/cash_flow.py:145
+#: accounts/report/cash_flow/cash_flow.py:143
 msgid "Net Cash from Financing"
 msgstr ""
 
-#: accounts/report/cash_flow/cash_flow.py:138
+#: accounts/report/cash_flow/cash_flow.py:136
 msgid "Net Cash from Investing"
 msgstr ""
 
-#: accounts/report/cash_flow/cash_flow.py:126
+#: accounts/report/cash_flow/cash_flow.py:124
 msgid "Net Cash from Operations"
 msgstr ""
 
-#: accounts/report/cash_flow/cash_flow.py:131
+#: accounts/report/cash_flow/cash_flow.py:129
 msgid "Net Change in Accounts Payable"
 msgstr ""
 
-#: accounts/report/cash_flow/cash_flow.py:130
+#: accounts/report/cash_flow/cash_flow.py:128
 msgid "Net Change in Accounts Receivable"
 msgstr ""
 
 #: accounts/report/cash_flow/cash_flow.py:110
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:259
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:253
 msgid "Net Change in Cash"
 msgstr ""
 
-#: accounts/report/cash_flow/cash_flow.py:147
+#: accounts/report/cash_flow/cash_flow.py:145
 msgid "Net Change in Equity"
 msgstr ""
 
-#: accounts/report/cash_flow/cash_flow.py:140
+#: accounts/report/cash_flow/cash_flow.py:138
 msgid "Net Change in Fixed Asset"
 msgstr ""
 
-#: accounts/report/cash_flow/cash_flow.py:132
+#: accounts/report/cash_flow/cash_flow.py:130
 msgid "Net Change in Inventory"
 msgstr ""
 
@@ -43292,13 +44183,13 @@
 msgid "Net Hour Rate"
 msgstr ""
 
-#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py:218
-#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py:219
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:110
+#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py:214
+#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py:215
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:108
 msgid "Net Profit"
 msgstr ""
 
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:176
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:174
 msgid "Net Profit/Loss"
 msgstr ""
 
@@ -43412,7 +44303,7 @@
 
 #: accounts/doctype/pos_closing_entry/closing_voucher_details.html:19
 #: accounts/report/purchase_register/purchase_register.py:253
-#: accounts/report/sales_register/sales_register.py:283
+#: accounts/report/sales_register/sales_register.py:284
 #: selling/page/point_of_sale/pos_item_cart.js:92
 #: selling/page/point_of_sale/pos_item_cart.js:505
 #: selling/page/point_of_sale/pos_item_cart.js:509
@@ -43604,7 +44495,7 @@
 msgid "Net Weight UOM"
 msgstr ""
 
-#: controllers/accounts_controller.py:1277
+#: controllers/accounts_controller.py:1285
 msgid "Net total calculation precision loss"
 msgstr ""
 
@@ -43622,7 +44513,7 @@
 msgid "New Asset Value"
 msgstr ""
 
-#: assets/dashboard_fixtures.py:165
+#: assets/dashboard_fixtures.py:164
 msgid "New Assets (This Year)"
 msgstr ""
 
@@ -43757,7 +44648,7 @@
 msgid "New Sales Person Name"
 msgstr ""
 
-#: stock/doctype/serial_no/serial_no.py:70
+#: stock/doctype/serial_no/serial_no.py:67
 msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
 msgstr ""
 
@@ -43780,7 +44671,7 @@
 msgid "New Workplace"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:350
+#: selling/doctype/customer/customer.py:347
 msgid "New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0}"
 msgstr ""
 
@@ -43803,7 +44694,7 @@
 msgid "New task"
 msgstr ""
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:213
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:211
 msgid "New {0} pricing rules are created"
 msgstr ""
 
@@ -43814,6 +44705,11 @@
 msgid "Newsletter"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Newton"
+msgstr ""
+
 #: www/book_appointment/index.html:34
 msgid "Next"
 msgstr ""
@@ -43955,12 +44851,12 @@
 msgid "No Answer"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2115
+#: accounts/doctype/sales_invoice/sales_invoice.py:2125
 msgid "No Customer found for Inter Company Transactions which represents company {0}"
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:115
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:350
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:348
 msgid "No Customers found with selected options."
 msgstr ""
 
@@ -43972,15 +44868,15 @@
 msgid "No Delivery Note selected for Customer {}"
 msgstr ""
 
-#: stock/get_item_details.py:204
+#: stock/get_item_details.py:199
 msgid "No Item with Barcode {0}"
 msgstr ""
 
-#: stock/get_item_details.py:208
+#: stock/get_item_details.py:203
 msgid "No Item with Serial No {0}"
 msgstr ""
 
-#: controllers/subcontracting_controller.py:1089
+#: controllers/subcontracting_controller.py:1175
 msgid "No Items selected for transfer."
 msgstr ""
 
@@ -44004,14 +44900,14 @@
 msgid "No Outstanding Invoices found for this party"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.py:526
+#: accounts/doctype/pos_invoice/pos_invoice.py:527
 msgid "No POS Profile found. Please create a New POS Profile first"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:1432
-#: accounts/doctype/journal_entry/journal_entry.py:1498
-#: accounts/doctype/journal_entry/journal_entry.py:1514
-#: stock/doctype/item/item.py:1333
+#: accounts/doctype/journal_entry/journal_entry.py:1428
+#: accounts/doctype/journal_entry/journal_entry.py:1488
+#: accounts/doctype/journal_entry/journal_entry.py:1502
+#: stock/doctype/item/item.py:1317
 msgid "No Permission"
 msgstr ""
 
@@ -44020,8 +44916,8 @@
 msgid "No Records for these settings."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:337
-#: accounts/doctype/sales_invoice/sales_invoice.py:966
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:336
+#: accounts/doctype/sales_invoice/sales_invoice.py:969
 msgid "No Remarks"
 msgstr ""
 
@@ -44033,15 +44929,15 @@
 msgid "No Summary"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2099
+#: accounts/doctype/sales_invoice/sales_invoice.py:2109
 msgid "No Supplier found for Inter Company Transactions which represents company {0}"
 msgstr ""
 
-#: accounts/doctype/tax_withholding_category/tax_withholding_category.py:200
+#: accounts/doctype/tax_withholding_category/tax_withholding_category.py:198
 msgid "No Tax Withholding data found for the current posting date."
 msgstr ""
 
-#: accounts/report/gross_profit/gross_profit.py:777
+#: accounts/report/gross_profit/gross_profit.py:775
 msgid "No Terms"
 msgstr ""
 
@@ -44053,16 +44949,16 @@
 msgid "No Unreconciled Payments found for this party"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:691
+#: manufacturing/doctype/production_plan/production_plan.py:692
 msgid "No Work Orders were created"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:726
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:607
+#: stock/doctype/purchase_receipt/purchase_receipt.py:721
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:615
 msgid "No accounting entries for the following warehouses"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:657
+#: selling/doctype/sales_order/sales_order.py:663
 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured"
 msgstr ""
 
@@ -44070,11 +44966,11 @@
 msgid "No additional fields available"
 msgstr ""
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:417
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:413
 msgid "No billing email found for customer: {0}"
 msgstr ""
 
-#: stock/doctype/delivery_trip/delivery_trip.py:422
+#: stock/doctype/delivery_trip/delivery_trip.py:417
 msgid "No contacts with email IDs found."
 msgstr ""
 
@@ -44082,7 +44978,7 @@
 msgid "No data for this period"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:48
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:46
 msgid "No data found. Seems like you uploaded a blank file"
 msgstr ""
 
@@ -44094,7 +44990,7 @@
 msgid "No description given"
 msgstr ""
 
-#: telephony/doctype/call_log/call_log.py:119
+#: telephony/doctype/call_log/call_log.py:117
 msgid "No employee was scheduled for call popup"
 msgstr ""
 
@@ -44106,7 +45002,7 @@
 msgid "No gain or loss in the exchange rate"
 msgstr ""
 
-#: controllers/subcontracting_controller.py:1010
+#: controllers/subcontracting_controller.py:1084
 msgid "No item available for transfer."
 msgstr ""
 
@@ -44127,15 +45023,15 @@
 msgid "No items in cart"
 msgstr ""
 
-#: setup/doctype/email_digest/email_digest.py:168
+#: setup/doctype/email_digest/email_digest.py:166
 msgid "No items to be received are overdue"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:423
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:418
 msgid "No matches occurred via auto reconciliation"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:888
+#: manufacturing/doctype/production_plan/production_plan.py:889
 msgid "No material request created"
 msgstr ""
 
@@ -44220,15 +45116,15 @@
 msgid "No outstanding invoices require exchange rate revaluation"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1820
+#: accounts/doctype/payment_entry/payment_entry.py:1841
 msgid "No outstanding {0} found for the {1} {2} which qualify the filters you have specified."
 msgstr ""
 
-#: public/js/controllers/buying.js:436
+#: public/js/controllers/buying.js:430
 msgid "No pending Material Requests found to link for the given items."
 msgstr ""
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:424
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:420
 msgid "No primary email found for customer: {0}"
 msgstr ""
 
@@ -44242,15 +45138,15 @@
 msgid "No record found"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:687
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:682
 msgid "No records found in Allocation table"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:584
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:581
 msgid "No records found in the Invoices table"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:587
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:584
 msgid "No records found in the Payments table"
 msgstr ""
 
@@ -44261,7 +45157,7 @@
 msgid "No stock transactions can be created or modified before this date."
 msgstr ""
 
-#: controllers/accounts_controller.py:2520
+#: controllers/accounts_controller.py:2497
 msgid "No updates pending for reposting"
 msgstr ""
 
@@ -44269,11 +45165,11 @@
 msgid "No values"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:340
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:338
 msgid "No {0} Accounts found for this company."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2166
+#: accounts/doctype/sales_invoice/sales_invoice.py:2173
 msgid "No {0} found for Inter Company Transactions."
 msgstr ""
 
@@ -44313,7 +45209,7 @@
 msgid "Non Profit"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1304
+#: manufacturing/doctype/bom/bom.py:1297
 msgid "Non stock items"
 msgstr ""
 
@@ -44324,22 +45220,21 @@
 msgid "None"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:369
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:372
 msgid "None of the items have any change in quantity or value."
 msgstr ""
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:175
-#: regional/italy/utils.py:162
-#: setup/setup_wizard/operations/defaults_setup.py:36
-#: setup/setup_wizard/operations/install_fixtures.py:483
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+#: setup/setup_wizard/operations/install_fixtures.py:473
 msgid "Nos"
 msgstr ""
 
 #: accounts/doctype/mode_of_payment/mode_of_payment.py:66
 #: accounts/doctype/pos_invoice/pos_invoice.py:254
-#: accounts/doctype/sales_invoice/sales_invoice.py:538
+#: accounts/doctype/sales_invoice/sales_invoice.py:534
 #: assets/doctype/asset/asset.js:603 assets/doctype/asset/asset.js:620
-#: controllers/buying_controller.py:206
+#: controllers/buying_controller.py:200
 #: selling/doctype/product_bundle/product_bundle.py:71
 #: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:72
 msgid "Not Allowed"
@@ -44381,9 +45276,9 @@
 msgid "Not Initiated"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:747
+#: buying/doctype/purchase_order/purchase_order.py:750
 #: templates/pages/material_request_info.py:21 templates/pages/order.py:34
-#: templates/pages/rfq.py:48
+#: templates/pages/rfq.py:46
 msgid "Not Permitted"
 msgstr ""
 
@@ -44394,10 +45289,10 @@
 msgid "Not Requested"
 msgstr ""
 
-#: selling/report/lost_quotations/lost_quotations.py:86
-#: support/report/issue_analytics/issue_analytics.py:208
-#: support/report/issue_summary/issue_summary.py:198
-#: support/report/issue_summary/issue_summary.py:275
+#: selling/report/lost_quotations/lost_quotations.py:84
+#: support/report/issue_analytics/issue_analytics.py:210
+#: support/report/issue_summary/issue_summary.py:206
+#: support/report/issue_summary/issue_summary.py:287
 msgid "Not Specified"
 msgstr ""
 
@@ -44438,15 +45333,15 @@
 msgid "Not allowed to create accounting dimension for {0}"
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:265
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:263
 msgid "Not allowed to update stock transactions older than {0}"
 msgstr ""
 
-#: setup/doctype/authorization_control/authorization_control.py:57
+#: setup/doctype/authorization_control/authorization_control.py:59
 msgid "Not authorized since {0} exceeds limits"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:399
+#: accounts/doctype/gl_entry/gl_entry.py:398
 msgid "Not authorized to edit frozen Account {0}"
 msgstr ""
 
@@ -44458,24 +45353,24 @@
 msgid "Not in stock"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:670
-#: manufacturing/doctype/work_order/work_order.py:1270
-#: manufacturing/doctype/work_order/work_order.py:1404
-#: manufacturing/doctype/work_order/work_order.py:1454
-#: selling/doctype/sales_order/sales_order.py:768
-#: selling/doctype/sales_order/sales_order.py:1527
+#: buying/doctype/purchase_order/purchase_order.py:671
+#: manufacturing/doctype/work_order/work_order.py:1267
+#: manufacturing/doctype/work_order/work_order.py:1399
+#: manufacturing/doctype/work_order/work_order.py:1449
+#: selling/doctype/sales_order/sales_order.py:766
+#: selling/doctype/sales_order/sales_order.py:1519
 msgid "Not permitted"
 msgstr ""
 
 #: buying/doctype/request_for_quotation/request_for_quotation.js:258
-#: manufacturing/doctype/bom_update_log/bom_update_log.py:100
-#: manufacturing/doctype/production_plan/production_plan.py:924
-#: manufacturing/doctype/production_plan/production_plan.py:1627
-#: public/js/controllers/buying.js:437 selling/doctype/customer/customer.py:125
+#: manufacturing/doctype/bom_update_log/bom_update_log.py:98
+#: manufacturing/doctype/production_plan/production_plan.py:925
+#: manufacturing/doctype/production_plan/production_plan.py:1621
+#: public/js/controllers/buying.js:431 selling/doctype/customer/customer.py:124
 #: selling/doctype/sales_order/sales_order.js:1116
-#: stock/doctype/item/item.js:494 stock/doctype/item/item.py:539
-#: stock/doctype/stock_entry/stock_entry.py:1297
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:786
+#: stock/doctype/item/item.js:494 stock/doctype/item/item.py:540
+#: stock/doctype/stock_entry/stock_entry.py:1306
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:784
 #: templates/pages/timelog_info.html:43
 msgid "Note"
 msgstr ""
@@ -44502,7 +45397,7 @@
 msgid "Note: Automatic log deletion only applies to logs of type <i>Update Cost</i>"
 msgstr ""
 
-#: accounts/party.py:658
+#: accounts/party.py:634
 msgid "Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s)"
 msgstr ""
 
@@ -44517,7 +45412,7 @@
 msgid "Note: Item {0} added multiple times"
 msgstr ""
 
-#: controllers/accounts_controller.py:494
+#: controllers/accounts_controller.py:497
 msgid "Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified"
 msgstr ""
 
@@ -44529,7 +45424,7 @@
 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:922
+#: accounts/doctype/journal_entry/journal_entry.py:930
 msgid "Note: {0}"
 msgstr ""
 
@@ -44610,8 +45505,8 @@
 msgid "Notes: "
 msgstr ""
 
-#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py:62
-#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py:63
+#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py:60
+#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py:61
 msgid "Nothing is included in gross"
 msgstr ""
 
@@ -44730,7 +45625,7 @@
 msgid "Number of Interaction"
 msgstr ""
 
-#: selling/report/inactive_customers/inactive_customers.py:82
+#: selling/report/inactive_customers/inactive_customers.py:78
 msgid "Number of Order"
 msgstr ""
 
@@ -44927,7 +45822,7 @@
 #: buying/doctype/supplier/supplier_list.js:5
 #: selling/doctype/sales_order/sales_order_list.js:21
 #: support/report/issue_summary/issue_summary.js:44
-#: support/report/issue_summary/issue_summary.py:360
+#: support/report/issue_summary/issue_summary.py:372
 msgid "On Hold"
 msgstr ""
 
@@ -45082,7 +45977,7 @@
 msgid "Ongoing Job Cards"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:105
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:103
 msgid "Only CSV and Excel files can be used to for importing data. Please check the file format you are trying to upload"
 msgstr ""
 
@@ -45104,7 +45999,7 @@
 msgid "Only Include Allocated Payments"
 msgstr ""
 
-#: accounts/doctype/account/account.py:135
+#: accounts/doctype/account/account.py:133
 msgid "Only Parent can be of type {0}"
 msgstr ""
 
@@ -45163,7 +46058,7 @@
 #: selling/doctype/quotation/quotation_list.js:26
 #: support/report/issue_analytics/issue_analytics.js:55
 #: support/report/issue_summary/issue_summary.js:42
-#: support/report/issue_summary/issue_summary.py:348
+#: support/report/issue_summary/issue_summary.py:360
 #: templates/pages/task_info.html:72
 msgid "Open"
 msgstr ""
@@ -45411,19 +46306,19 @@
 msgid "Opening & Closing"
 msgstr ""
 
-#: accounts/report/trial_balance/trial_balance.py:436
-#: accounts/report/trial_balance_for_party/trial_balance_for_party.py:193
+#: accounts/report/trial_balance/trial_balance.py:430
+#: accounts/report/trial_balance_for_party/trial_balance_for_party.py:185
 msgid "Opening (Cr)"
 msgstr ""
 
-#: accounts/report/trial_balance/trial_balance.py:429
-#: accounts/report/trial_balance_for_party/trial_balance_for_party.py:186
+#: accounts/report/trial_balance/trial_balance.py:423
+#: accounts/report/trial_balance_for_party/trial_balance_for_party.py:178
 msgid "Opening (Dr)"
 msgstr ""
 
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:143
-#: assets/report/fixed_asset_register/fixed_asset_register.py:386
-#: assets/report/fixed_asset_register/fixed_asset_register.py:447
+#: assets/report/fixed_asset_register/fixed_asset_register.py:376
+#: assets/report/fixed_asset_register/fixed_asset_register.py:437
 msgid "Opening Accumulated Depreciation"
 msgstr ""
 
@@ -45439,7 +46334,7 @@
 msgid "Opening Accumulated Depreciation"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:430
+#: assets/doctype/asset/asset.py:427
 msgid "Opening Accumulated Depreciation must be less than or equal to {0}"
 msgstr ""
 
@@ -45455,7 +46350,7 @@
 msgid "Opening Amount"
 msgstr ""
 
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.py:97
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.py:95
 msgid "Opening Balance"
 msgstr ""
 
@@ -45489,7 +46384,7 @@
 msgid "Opening Entry"
 msgstr ""
 
-#: accounts/general_ledger.py:685
+#: accounts/general_ledger.py:675
 msgid "Opening Entry can not be created after Period Closing Voucher is created."
 msgstr ""
 
@@ -45528,11 +46423,11 @@
 msgstr ""
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:79
-#: stock/report/stock_balance/stock_balance.py:427
+#: stock/report/stock_balance/stock_balance.py:426
 msgid "Opening Qty"
 msgstr ""
 
-#: stock/doctype/item/item.py:296
+#: stock/doctype/item/item.py:295
 msgid "Opening Stock"
 msgstr ""
 
@@ -45554,7 +46449,7 @@
 msgid "Opening Time"
 msgstr ""
 
-#: stock/report/stock_balance/stock_balance.py:434
+#: stock/report/stock_balance/stock_balance.py:433
 msgid "Opening Value"
 msgstr ""
 
@@ -45567,7 +46462,7 @@
 msgid "Opening {0} Invoices created"
 msgstr ""
 
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:126
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:124
 msgid "Operating Cost"
 msgstr ""
 
@@ -45595,7 +46490,7 @@
 msgid "Operating Cost Per BOM Quantity"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1320
+#: manufacturing/doctype/bom/bom.py:1313
 msgid "Operating Cost as per Work Order / BOM"
 msgstr ""
 
@@ -45625,7 +46520,7 @@
 #: manufacturing/onboarding_step/operation/operation.json
 #: manufacturing/report/bom_operations_time/bom_operations_time.py:112
 #: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:49
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:110
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:108
 #: manufacturing/report/job_card_summary/job_card_summary.js:78
 #: manufacturing/report/job_card_summary/job_card_summary.py:167
 msgid "Operation"
@@ -45749,7 +46644,7 @@
 msgid "Operation Time "
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:999
+#: manufacturing/doctype/work_order/work_order.py:996
 msgid "Operation Time must be greater than 0 for Operation {0}"
 msgstr ""
 
@@ -45770,16 +46665,16 @@
 msgid "Operation {0} added multiple times in the work order {1}"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:990
+#: manufacturing/doctype/job_card/job_card.py:978
 msgid "Operation {0} does not belong to the work order {1}"
 msgstr ""
 
-#: manufacturing/doctype/workstation/workstation.py:335
+#: manufacturing/doctype/workstation/workstation.py:336
 msgid "Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations"
 msgstr ""
 
 #: manufacturing/doctype/work_order/work_order.js:235
-#: setup/doctype/company/company.py:340 templates/generators/bom.html:61
+#: setup/doctype/company/company.py:332 templates/generators/bom.html:61
 msgid "Operations"
 msgstr ""
 
@@ -45805,7 +46700,7 @@
 msgid "Operations"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:966
+#: manufacturing/doctype/bom/bom.py:961
 msgid "Operations cannot be left blank"
 msgstr ""
 
@@ -46082,7 +46977,7 @@
 
 #: buying/report/subcontract_order_summary/subcontract_order_summary.py:142
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:148
-#: manufacturing/report/production_planning_report/production_planning_report.py:368
+#: manufacturing/report/production_planning_report/production_planning_report.py:371
 msgid "Order Qty"
 msgstr ""
 
@@ -46154,8 +47049,8 @@
 msgid "Ordered"
 msgstr ""
 
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:171
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:240
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:169
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:238
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:49
 #: stock/report/stock_projected_qty/stock_projected_qty.py:157
 msgid "Ordered Qty"
@@ -46252,7 +47147,7 @@
 msgid "Original Item"
 msgstr ""
 
-#: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:103
+#: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:105
 msgid "Original invoice should be consolidated before or along with the return invoice."
 msgstr ""
 
@@ -46338,13 +47233,43 @@
 msgid "Other Settings"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Ounce"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Ounce-Force"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Ounce/Cubic Foot"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Ounce/Cubic Inch"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Ounce/Gallon (UK)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Ounce/Gallon (US)"
+msgstr ""
+
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:81
-#: stock/report/stock_balance/stock_balance.py:449
+#: stock/report/stock_balance/stock_balance.py:448
 #: stock/report/stock_ledger/stock_ledger.py:219
 msgid "Out Qty"
 msgstr ""
 
-#: stock/report/stock_balance/stock_balance.py:455
+#: stock/report/stock_balance/stock_balance.py:454
 msgid "Out Value"
 msgstr ""
 
@@ -46371,7 +47296,7 @@
 msgid "Out of Order"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:426
+#: stock/doctype/pick_list/pick_list.py:423
 msgid "Out of Stock"
 msgstr ""
 
@@ -46445,10 +47370,10 @@
 #: accounts/doctype/payment_entry/payment_entry.js:799
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:179
 #: accounts/report/accounts_receivable/accounts_receivable.html:149
-#: accounts/report/accounts_receivable/accounts_receivable.py:1082
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:171
+#: accounts/report/accounts_receivable/accounts_receivable.py:1072
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:169
 #: accounts/report/purchase_register/purchase_register.py:289
-#: accounts/report/sales_register/sales_register.py:317
+#: accounts/report/sales_register/sales_register.py:318
 msgid "Outstanding Amount"
 msgstr ""
 
@@ -46498,11 +47423,11 @@
 msgid "Outstanding Amt"
 msgstr ""
 
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:47
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:44
 msgid "Outstanding Cheques and Deposits to clear"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:376
+#: accounts/doctype/gl_entry/gl_entry.py:373
 msgid "Outstanding for {0} cannot be less than zero ({1})"
 msgstr ""
 
@@ -46551,11 +47476,11 @@
 msgid "Over Delivery/Receipt Allowance (%)"
 msgstr ""
 
-#: controllers/stock_controller.py:1082
+#: controllers/stock_controller.py:1108
 msgid "Over Receipt"
 msgstr ""
 
-#: controllers/status_updater.py:367
+#: controllers/status_updater.py:363
 msgid "Over Receipt/Delivery of {0} {1} ignored for item {2} because you have {3} role."
 msgstr ""
 
@@ -46571,11 +47496,11 @@
 msgid "Over Transfer Allowance (%)"
 msgstr ""
 
-#: controllers/status_updater.py:369
+#: controllers/status_updater.py:365
 msgid "Overbilling of {0} {1} ignored for item {2} because you have {3} role."
 msgstr ""
 
-#: controllers/accounts_controller.py:1802
+#: controllers/accounts_controller.py:1792
 msgid "Overbilling of {} ignored because you have {} role."
 msgstr ""
 
@@ -46657,11 +47582,11 @@
 msgid "Overdue and Discounted"
 msgstr ""
 
-#: buying/doctype/supplier_scorecard/supplier_scorecard.py:69
+#: buying/doctype/supplier_scorecard/supplier_scorecard.py:70
 msgid "Overlap in scoring between {0} and {1}"
 msgstr ""
 
-#: accounts/doctype/shipping_rule/shipping_rule.py:198
+#: accounts/doctype/shipping_rule/shipping_rule.py:199
 msgid "Overlapping conditions found between:"
 msgstr ""
 
@@ -46706,7 +47631,7 @@
 #: accounts/report/sales_payment_summary/sales_payment_summary.py:23
 #: accounts/report/sales_payment_summary/sales_payment_summary.py:39
 #: accounts/report/sales_register/sales_register.js:46
-#: accounts/report/sales_register/sales_register.py:234
+#: accounts/report/sales_register/sales_register.py:235
 #: crm/report/lead_details/lead_details.py:45
 msgid "Owner"
 msgstr ""
@@ -46818,7 +47743,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/pos_invoice/pos_invoice.json
-#: accounts/report/pos_register/pos_register.py:179
+#: accounts/report/pos_register/pos_register.py:173
 msgid "POS Invoice"
 msgstr ""
 
@@ -46895,11 +47820,11 @@
 msgid "POS Invoices"
 msgstr ""
 
-#: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:540
+#: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:538
 msgid "POS Invoices will be consolidated in a background process"
 msgstr ""
 
-#: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:542
+#: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:540
 msgid "POS Invoices will be unconsolidated in a background process"
 msgstr ""
 
@@ -46944,8 +47869,8 @@
 #. Name of a DocType
 #: accounts/doctype/pos_profile/pos_profile.json
 #: accounts/report/pos_register/pos_register.js:32
-#: accounts/report/pos_register/pos_register.py:120
-#: accounts/report/pos_register/pos_register.py:193
+#: accounts/report/pos_register/pos_register.py:116
+#: accounts/report/pos_register/pos_register.py:187
 #: selling/page/point_of_sale/pos_controller.js:80
 msgid "POS Profile"
 msgstr ""
@@ -46983,7 +47908,7 @@
 msgid "POS Profile doesn't matches {}"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1135
+#: accounts/doctype/sales_invoice/sales_invoice.py:1139
 msgid "POS Profile required to make POS Entry"
 msgstr ""
 
@@ -47097,7 +48022,7 @@
 msgid "PZN"
 msgstr ""
 
-#: stock/doctype/packing_slip/packing_slip.py:117
+#: stock/doctype/packing_slip/packing_slip.py:115
 msgid "Package No(s) already in use. Try from Package No {0}"
 msgstr ""
 
@@ -47140,7 +48065,7 @@
 msgid "Packed Items"
 msgstr ""
 
-#: controllers/stock_controller.py:922
+#: controllers/stock_controller.py:946
 msgid "Packed Items cannot be transferred internally"
 msgstr ""
 
@@ -47197,7 +48122,7 @@
 msgid "Packing Slip Item"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:765
+#: stock/doctype/delivery_note/delivery_note.py:780
 msgid "Packing Slip(s) cancelled"
 msgstr ""
 
@@ -47338,10 +48263,10 @@
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:170
 #: accounts/report/accounts_receivable/accounts_receivable.html:146
-#: accounts/report/accounts_receivable/accounts_receivable.py:1076
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:169
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.py:111
-#: accounts/report/pos_register/pos_register.py:214
+#: accounts/report/accounts_receivable/accounts_receivable.py:1066
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:167
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.py:109
+#: accounts/report/pos_register/pos_register.py:208
 #: selling/page/point_of_sale/pos_payment.js:590
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56
 msgid "Paid Amount"
@@ -47441,11 +48366,16 @@
 msgid "Paid To Account Type"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:328
-#: accounts/doctype/sales_invoice/sales_invoice.py:1011
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:327
+#: accounts/doctype/sales_invoice/sales_invoice.py:1015
 msgid "Paid amount + Write Off Amount can not be greater than Grand Total"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Pair"
+msgstr ""
+
 #. Label of a Select field in DocType 'Shipment'
 #: stock/doctype/shipment/shipment.json
 msgctxt "Shipment"
@@ -47570,7 +48500,7 @@
 msgid "Parent Account"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:379
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:377
 msgid "Parent Account Missing"
 msgstr ""
 
@@ -47586,7 +48516,7 @@
 msgid "Parent Company"
 msgstr ""
 
-#: setup/doctype/company/company.py:459
+#: setup/doctype/company/company.py:451
 msgid "Parent Company must be a group company"
 msgstr ""
 
@@ -47708,7 +48638,7 @@
 msgid "Partial Material Transferred"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1045
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1033
 msgid "Partial Stock Reservation"
 msgstr ""
 
@@ -47917,6 +48847,11 @@
 msgid "Parts Per Hour"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Parts Per Million"
+msgstr ""
+
 #: accounts/doctype/bank_account/bank_account_dashboard.py:16
 #: accounts/doctype/payment_terms_template/payment_terms_template_dashboard.py:16
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:164
@@ -47928,10 +48863,10 @@
 #: accounts/report/accounts_receivable/accounts_receivable.html:159
 #: accounts/report/accounts_receivable/accounts_receivable.js:57
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:89
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:151
-#: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:233
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:149
+#: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:230
 #: accounts/report/general_ledger/general_ledger.js:74
-#: accounts/report/general_ledger/general_ledger.py:646
+#: accounts/report/general_ledger/general_ledger.py:637
 #: accounts/report/payment_ledger/payment_ledger.js:51
 #: accounts/report/payment_ledger/payment_ledger.py:154
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46
@@ -48084,7 +49019,7 @@
 msgid "Party Account No. (Bank Statement)"
 msgstr ""
 
-#: controllers/accounts_controller.py:2075
+#: controllers/accounts_controller.py:2056
 msgid "Party Account {0} currency ({1}) and document currency ({2}) should be same"
 msgstr ""
 
@@ -48192,10 +49127,10 @@
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:76
 #: accounts/report/accounts_receivable/accounts_receivable.js:44
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:76
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:145
-#: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:223
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:143
+#: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:220
 #: accounts/report/general_ledger/general_ledger.js:65
-#: accounts/report/general_ledger/general_ledger.py:645
+#: accounts/report/general_ledger/general_ledger.py:636
 #: accounts/report/payment_ledger/payment_ledger.js:41
 #: accounts/report/payment_ledger/payment_ledger.py:150
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35
@@ -48305,11 +49240,11 @@
 msgid "Party Type"
 msgstr ""
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:611
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:612
 msgid "Party Type and Party is mandatory for {0} account"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:161
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:156
 msgid "Party Type and Party is required for Receivable / Payable account {0}"
 msgstr ""
 
@@ -48331,6 +49266,11 @@
 msgid "Party is mandatory"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Pascal"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'Quality Review'
 #: quality_management/doctype/quality_review/quality_review.json
 msgctxt "Quality Review"
@@ -48450,7 +49390,7 @@
 msgstr ""
 
 #: accounts/report/accounts_payable/accounts_payable.js:42
-#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:206
+#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:210
 #: accounts/report/purchase_register/purchase_register.py:194
 #: accounts/report/purchase_register/purchase_register.py:235
 msgid "Payable Account"
@@ -48481,7 +49421,7 @@
 #: accounts/doctype/sales_invoice/sales_invoice.js:109
 #: accounts/doctype/sales_invoice/sales_invoice_dashboard.py:25
 #: accounts/doctype/sales_invoice/sales_invoice_list.js:39
-#: buying/doctype/purchase_order/purchase_order.js:385
+#: buying/doctype/purchase_order/purchase_order.js:391
 #: buying/doctype/purchase_order/purchase_order_dashboard.py:20
 #: selling/doctype/sales_order/sales_order.js:713
 #: selling/doctype/sales_order/sales_order_dashboard.py:28
@@ -48540,7 +49480,7 @@
 msgid "Payment Deductions or Loss"
 msgstr ""
 
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:73
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:70
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:84
 msgid "Payment Document"
 msgstr ""
@@ -48558,7 +49498,7 @@
 msgstr ""
 
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.py:23
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:67
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:64
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:78
 msgid "Payment Document Type"
 msgstr ""
@@ -48591,7 +49531,7 @@
 msgid "Payment Entries"
 msgstr ""
 
-#: accounts/utils.py:946
+#: accounts/utils.py:926
 msgid "Payment Entries {0} are un-linked"
 msgstr ""
 
@@ -48653,20 +49593,20 @@
 msgid "Payment Entry Reference"
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:413
+#: accounts/doctype/payment_request/payment_request.py:409
 msgid "Payment Entry already exists"
 msgstr ""
 
-#: accounts/utils.py:613
+#: accounts/utils.py:601
 msgid "Payment Entry has been modified after you pulled it. Please pull it again."
 msgstr ""
 
 #: accounts/doctype/payment_request/payment_request.py:111
-#: accounts/doctype/payment_request/payment_request.py:460
+#: accounts/doctype/payment_request/payment_request.py:456
 msgid "Payment Entry is already created"
 msgstr ""
 
-#: controllers/accounts_controller.py:1231
+#: controllers/accounts_controller.py:1240
 msgid "Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice."
 msgstr ""
 
@@ -48721,7 +49661,7 @@
 msgid "Payment Gateway Account"
 msgstr ""
 
-#: accounts/utils.py:1196
+#: accounts/utils.py:1169
 msgid "Payment Gateway Account not created, please create one manually."
 msgstr ""
 
@@ -48736,7 +49676,7 @@
 msgid "Payment Ledger"
 msgstr ""
 
-#: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:253
+#: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:250
 msgid "Payment Ledger Balance"
 msgstr ""
 
@@ -48752,8 +49692,8 @@
 msgstr ""
 
 #: accounts/report/pos_register/pos_register.js:50
-#: accounts/report/pos_register/pos_register.py:129
-#: accounts/report/pos_register/pos_register.py:221
+#: accounts/report/pos_register/pos_register.py:125
+#: accounts/report/pos_register/pos_register.py:215
 #: selling/page/point_of_sale/pos_payment.js:19
 msgid "Payment Method"
 msgstr ""
@@ -48911,7 +49851,7 @@
 #: accounts/doctype/payment_request/payment_request.json
 #: accounts/doctype/purchase_invoice/purchase_invoice.js:145
 #: accounts/doctype/sales_invoice/sales_invoice.js:143
-#: buying/doctype/purchase_order/purchase_order.js:393
+#: buying/doctype/purchase_order/purchase_order.js:399
 #: selling/doctype/sales_order/sales_order.js:709
 msgid "Payment Request"
 msgstr ""
@@ -48941,7 +49881,7 @@
 msgid "Payment Request Type"
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:507
+#: accounts/doctype/payment_request/payment_request.py:499
 msgid "Payment Request for {0}"
 msgstr ""
 
@@ -48949,7 +49889,7 @@
 msgid "Payment Request took too long to respond. Please try requesting for payment again."
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:453
+#: accounts/doctype/payment_request/payment_request.py:449
 msgid "Payment Requests cannot be created against: {0}"
 msgstr ""
 
@@ -49002,8 +49942,8 @@
 
 #. Name of a DocType
 #: accounts/doctype/payment_term/payment_term.json
-#: accounts/report/accounts_receivable/accounts_receivable.py:1072
-#: accounts/report/gross_profit/gross_profit.py:348
+#: accounts/report/accounts_receivable/accounts_receivable.py:1062
+#: accounts/report/gross_profit/gross_profit.py:346
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:30
 msgid "Payment Term"
 msgstr ""
@@ -49171,19 +50111,19 @@
 msgid "Payment Type"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:510
+#: accounts/doctype/payment_entry/payment_entry.py:514
 msgid "Payment Type must be one of Receive, Pay and Internal Transfer"
 msgstr ""
 
-#: accounts/utils.py:936
+#: accounts/utils.py:918
 msgid "Payment Unlink Error"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:791
+#: accounts/doctype/journal_entry/journal_entry.py:798
 msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.py:649
+#: accounts/doctype/pos_invoice/pos_invoice.py:650
 msgid "Payment amount cannot be less than or equal to 0"
 msgstr ""
 
@@ -49200,7 +50140,7 @@
 msgid "Payment of {0} received successfully. Waiting for other requests to complete..."
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.py:311
+#: accounts/doctype/pos_invoice/pos_invoice.py:312
 msgid "Payment related to {0} is not completed"
 msgstr ""
 
@@ -49208,7 +50148,7 @@
 msgid "Payment request failed"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:722
+#: accounts/doctype/payment_entry/payment_entry.py:734
 msgid "Payment term {0} not used in {1}"
 msgstr ""
 
@@ -49287,8 +50227,18 @@
 msgid "Payslip"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Peck (UK)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Peck (US)"
+msgstr ""
+
 #: assets/doctype/asset_repair/asset_repair_list.js:5
-#: buying/doctype/request_for_quotation/request_for_quotation.py:338
+#: buying/doctype/request_for_quotation/request_for_quotation.py:337
 #: buying/doctype/supplier_quotation/supplier_quotation.py:198
 #: manufacturing/report/work_order_summary/work_order_summary.py:150
 #: stock/doctype/material_request/material_request_list.js:16
@@ -49364,12 +50314,12 @@
 
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:64
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:64
-#: buying/report/purchase_order_analysis/purchase_order_analysis.py:255
+#: buying/report/purchase_order_analysis/purchase_order_analysis.py:251
 #: selling/report/sales_order_analysis/sales_order_analysis.py:306
 msgid "Pending Amount"
 msgstr ""
 
-#: buying/report/purchase_order_analysis/purchase_order_analysis.py:218
+#: buying/report/purchase_order_analysis/purchase_order_analysis.py:214
 #: manufacturing/doctype/work_order/work_order.js:259
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:155
 #: selling/doctype/sales_order/sales_order.js:1153
@@ -49409,11 +50359,11 @@
 msgid "Pending Work Order"
 msgstr ""
 
-#: setup/doctype/email_digest/email_digest.py:184
+#: setup/doctype/email_digest/email_digest.py:182
 msgid "Pending activities for today"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:219
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:216
 msgid "Pending processing"
 msgstr ""
 
@@ -49450,6 +50400,11 @@
 msgid "Per Year"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Percent"
+msgstr ""
+
 #. Option for the 'Margin Type' (Select) field in DocType 'Delivery Note Item'
 #: stock/doctype/delivery_note_item/delivery_note_item.json
 msgctxt "Delivery Note Item"
@@ -49537,7 +50492,7 @@
 msgid "Percentage Allocation"
 msgstr ""
 
-#: accounts/doctype/monthly_distribution/monthly_distribution.py:58
+#: accounts/doctype/monthly_distribution/monthly_distribution.py:57
 msgid "Percentage Allocation should be equal to 100%"
 msgstr ""
 
@@ -49562,7 +50517,7 @@
 msgid "Percentage you are allowed to transfer more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to transfer 110 units."
 msgstr ""
 
-#: setup/setup_wizard/operations/install_fixtures.py:394
+#: setup/setup_wizard/operations/install_fixtures.py:386
 msgid "Perception Analysis"
 msgstr ""
 
@@ -49578,7 +50533,7 @@
 msgid "Period Based On"
 msgstr ""
 
-#: accounts/general_ledger.py:699
+#: accounts/general_ledger.py:687
 msgid "Period Closed"
 msgstr ""
 
@@ -49864,7 +50819,7 @@
 msgid "Pick List"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:120
+#: stock/doctype/pick_list/pick_list.py:119
 msgid "Pick List Incomplete"
 msgstr ""
 
@@ -49979,6 +50934,26 @@
 msgid "Pickup to"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Pint (UK)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Pint (US)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Pint, Dry (US)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Pint, Liquid (US)"
+msgstr ""
+
 #: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:8
 msgid "Pipeline By"
 msgstr ""
@@ -50007,12 +50982,12 @@
 msgid "Plaid Environment"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:152
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:176
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:154
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:178
 msgid "Plaid Link Failed"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:254
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:252
 msgid "Plaid Link Refresh Required"
 msgstr ""
 
@@ -50226,7 +51201,7 @@
 msgid "Plants and Machineries"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:423
+#: stock/doctype/pick_list/pick_list.py:420
 msgid "Please Restock Items and Update the Pick List to continue. To discontinue, cancel the Pick List."
 msgstr ""
 
@@ -50256,7 +51231,7 @@
 msgid "Please Specify Account"
 msgstr ""
 
-#: buying/doctype/supplier/supplier.py:123
+#: buying/doctype/supplier/supplier.py:122
 msgid "Please add 'Supplier' role to user {0}."
 msgstr ""
 
@@ -50264,11 +51239,11 @@
 msgid "Please add Mode of payments and opening balance details."
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:169
+#: buying/doctype/request_for_quotation/request_for_quotation.py:168
 msgid "Please add Request for Quotation to the sidebar in Portal Settings."
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:416
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:414
 msgid "Please add Root Account for - {0}"
 msgstr ""
 
@@ -50280,7 +51255,7 @@
 msgid "Please add atleast one Serial No / Batch No"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.py:78
+#: accounts/doctype/bank_statement_import/bank_statement_import.py:76
 msgid "Please add the Bank Account column"
 msgstr ""
 
@@ -50288,15 +51263,15 @@
 msgid "Please add the account to root level Company - {0}"
 msgstr ""
 
-#: accounts/doctype/account/account.py:234
+#: accounts/doctype/account/account.py:230
 msgid "Please add the account to root level Company - {}"
 msgstr ""
 
-#: controllers/website_list_for_contact.py:300
+#: controllers/website_list_for_contact.py:298
 msgid "Please add {1} role to user {0}."
 msgstr ""
 
-#: controllers/stock_controller.py:1095
+#: controllers/stock_controller.py:1119
 msgid "Please adjust the qty or edit {0} to proceed."
 msgstr ""
 
@@ -50304,24 +51279,24 @@
 msgid "Please attach CSV file"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2704
+#: accounts/doctype/sales_invoice/sales_invoice.py:2707
 msgid "Please cancel and amend the Payment Entry"
 msgstr ""
 
-#: accounts/utils.py:935
+#: accounts/utils.py:917
 msgid "Please cancel payment entry manually first"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:291
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:338
+#: accounts/doctype/gl_entry/gl_entry.py:294
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:342
 msgid "Please cancel related transaction."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:863
+#: accounts/doctype/journal_entry/journal_entry.py:872
 msgid "Please check Multi Currency option to allow accounts with other currency"
 msgstr ""
 
-#: accounts/deferred_revenue.py:570
+#: accounts/deferred_revenue.py:542
 msgid "Please check Process Deferred Accounting {0} and submit manually after resolving errors."
 msgstr ""
 
@@ -50329,7 +51304,7 @@
 msgid "Please check either with operations or FG Based Operating Cost."
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:412
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:409
 msgid "Please check the error message and take necessary actions to fix the error and then restart the reposting again."
 msgstr ""
 
@@ -50341,11 +51316,11 @@
 msgid "Please check your email to confirm the appointment"
 msgstr ""
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:377
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:374
 msgid "Please click on 'Generate Schedule'"
 msgstr ""
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:389
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:386
 msgid "Please click on 'Generate Schedule' to fetch Serial No added for Item {0}"
 msgstr ""
 
@@ -50353,23 +51328,23 @@
 msgid "Please click on 'Generate Schedule' to get schedule"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:550
+#: selling/doctype/customer/customer.py:545
 msgid "Please contact any of the following users to extend the credit limits for {0}: {1}"
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:332
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:336
 msgid "Please contact any of the following users to {} this transaction."
 msgstr ""
 
-#: selling/doctype/customer/customer.py:543
+#: selling/doctype/customer/customer.py:538
 msgid "Please contact your administrator to extend the credit limits for {0}."
 msgstr ""
 
-#: accounts/doctype/account/account.py:336
+#: accounts/doctype/account/account.py:332
 msgid "Please convert the parent account in corresponding child company to a group account."
 msgstr ""
 
-#: selling/doctype/quotation/quotation.py:554
+#: selling/doctype/quotation/quotation.py:549
 msgid "Please create Customer from Lead {0}."
 msgstr ""
 
@@ -50377,39 +51352,39 @@
 msgid "Please create Landed Cost Vouchers against Invoices that have 'Update Stock' enabled."
 msgstr ""
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:71
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:69
 msgid "Please create a new Accounting Dimension if required."
 msgstr ""
 
-#: controllers/accounts_controller.py:578
+#: controllers/accounts_controller.py:587
 msgid "Please create purchase from internal sale or delivery document itself"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:329
+#: assets/doctype/asset/asset.py:325
 msgid "Please create purchase receipt or purchase invoice for the item {0}"
 msgstr ""
 
-#: stock/doctype/item/item.py:626
+#: stock/doctype/item/item.py:622
 msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:368
+#: assets/doctype/asset/asset.py:364
 msgid "Please do not book expense of multiple assets against one single Asset."
 msgstr ""
 
-#: controllers/item_variant.py:234
+#: controllers/item_variant.py:228
 msgid "Please do not create more than 500 items at a time"
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:127
+#: accounts/doctype/budget/budget.py:130
 msgid "Please enable Applicable on Booking Actual Expenses"
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:123
+#: accounts/doctype/budget/budget.py:126
 msgid "Please enable Applicable on Purchase Order and Applicable on Booking Actual Expenses"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:143
+#: stock/doctype/pick_list/pick_list.py:142
 msgid "Please enable Use Old Serial / Batch Fields to make_bundle"
 msgstr ""
 
@@ -50419,36 +51394,36 @@
 msgid "Please enable pop-ups"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:505
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:499
 msgid "Please enable {0} in the {1}."
 msgstr ""
 
-#: controllers/selling_controller.py:681
+#: controllers/selling_controller.py:686
 msgid "Please enable {} in {} to allow same item in multiple rows"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:888
+#: accounts/doctype/sales_invoice/sales_invoice.py:880
 msgid "Please ensure {} account is a Balance Sheet account."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:370
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:369
 msgid "Please ensure {} account is a Balance Sheet account. You can change the parent account to a Balance Sheet account or select a different account."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:378
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:377
 msgid "Please ensure {} account {} is a Payable account. Change the account type to Payable or select a different account."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:897
+#: accounts/doctype/sales_invoice/sales_invoice.py:890
 msgid "Please ensure {} account {} is a Receivable account."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:518
+#: stock/doctype/stock_entry/stock_entry.py:519
 msgid "Please enter <b>Difference Account</b> or set default <b>Stock Adjustment Account</b> for company {0}"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.py:430
-#: accounts/doctype/sales_invoice/sales_invoice.py:1046
+#: accounts/doctype/pos_invoice/pos_invoice.py:431
+#: accounts/doctype/sales_invoice/sales_invoice.py:1050
 msgid "Please enter Account for Change Amount"
 msgstr ""
 
@@ -50460,7 +51435,7 @@
 msgid "Please enter Cost Center"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:325
+#: selling/doctype/sales_order/sales_order.py:330
 msgid "Please enter Delivery Date"
 msgstr ""
 
@@ -50468,7 +51443,7 @@
 msgid "Please enter Employee Id of this sales person"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:762
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:760
 msgid "Please enter Expense Account"
 msgstr ""
 
@@ -50477,7 +51452,7 @@
 msgid "Please enter Item Code to get Batch Number"
 msgstr ""
 
-#: public/js/controllers/transaction.js:2289
+#: public/js/controllers/transaction.js:2290
 msgid "Please enter Item Code to get batch no"
 msgstr ""
 
@@ -50485,7 +51460,7 @@
 msgid "Please enter Item first"
 msgstr ""
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:225
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:224
 msgid "Please enter Maintenance Details first"
 msgstr ""
 
@@ -50509,15 +51484,15 @@
 msgid "Please enter Receipt Document"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:928
+#: accounts/doctype/journal_entry/journal_entry.py:936
 msgid "Please enter Reference date"
 msgstr ""
 
-#: controllers/buying_controller.py:877
+#: controllers/buying_controller.py:880
 msgid "Please enter Reqd by Date"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:395
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:393
 msgid "Please enter Root Type for account- {0}"
 msgstr ""
 
@@ -50529,7 +51504,7 @@
 msgid "Please enter Shipment Parcel information"
 msgstr ""
 
-#: assets/doctype/asset_repair/asset_repair.py:173
+#: assets/doctype/asset_repair/asset_repair.py:172
 msgid "Please enter Stock Items consumed during the Repair."
 msgstr ""
 
@@ -50537,12 +51512,12 @@
 msgid "Please enter Warehouse and Date"
 msgstr ""
 
-#: assets/doctype/asset_repair/asset_repair.py:177
+#: assets/doctype/asset_repair/asset_repair.py:175
 msgid "Please enter Warehouse from which Stock Items consumed during the Repair were taken."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:613
-#: accounts/doctype/sales_invoice/sales_invoice.py:1042
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:617
+#: accounts/doctype/sales_invoice/sales_invoice.py:1046
 msgid "Please enter Write Off Account"
 msgstr ""
 
@@ -50554,7 +51529,7 @@
 msgid "Please enter company name first"
 msgstr ""
 
-#: controllers/accounts_controller.py:2470
+#: controllers/accounts_controller.py:2447
 msgid "Please enter default currency in Company Master"
 msgstr ""
 
@@ -50566,7 +51541,7 @@
 msgid "Please enter mobile number first."
 msgstr ""
 
-#: accounts/doctype/cost_center/cost_center.py:47
+#: accounts/doctype/cost_center/cost_center.py:45
 msgid "Please enter parent cost center"
 msgstr ""
 
@@ -50586,7 +51561,7 @@
 msgid "Please enter the company name to confirm"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.py:652
+#: accounts/doctype/pos_invoice/pos_invoice.py:653
 msgid "Please enter the phone number first"
 msgstr ""
 
@@ -50606,7 +51581,7 @@
 msgid "Please enter {0} first"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:391
+#: manufacturing/doctype/production_plan/production_plan.py:390
 msgid "Please fill the Material Requests table"
 msgstr ""
 
@@ -50622,15 +51597,15 @@
 msgid "Please fix overlapping time slots for {0}"
 msgstr ""
 
-#: telephony/doctype/incoming_call_settings/incoming_call_settings.py:73
+#: telephony/doctype/incoming_call_settings/incoming_call_settings.py:72
 msgid "Please fix overlapping time slots for {0}."
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:67
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:65
 msgid "Please import accounts against parent company or enable {} in company master."
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:175
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:176
 msgid "Please keep one Applicable Charges, when 'Distribute Charges Based On' is 'Distribute Manually'. For more charges, please create another Landed Cost Voucher."
 msgstr ""
 
@@ -50638,7 +51613,7 @@
 msgid "Please make sure the employees above report to another Active employee."
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:374
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:372
 msgid "Please make sure the file you are using has 'Parent Account' column present in the header."
 msgstr ""
 
@@ -50650,23 +51625,23 @@
 msgid "Please mention 'Weight UOM' along with Weight."
 msgstr ""
 
-#: accounts/general_ledger.py:564
+#: accounts/general_ledger.py:556
 msgid "Please mention Round Off Account in Company"
 msgstr ""
 
-#: accounts/general_ledger.py:567
+#: accounts/general_ledger.py:559
 msgid "Please mention Round Off Cost Center in Company"
 msgstr ""
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:233
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:232
 msgid "Please mention no of visits required"
 msgstr ""
 
-#: manufacturing/doctype/bom_update_log/bom_update_log.py:72
+#: manufacturing/doctype/bom_update_log/bom_update_log.py:70
 msgid "Please mention the Current and New BOM for replacement."
 msgstr ""
 
-#: selling/doctype/installation_note/installation_note.py:119
+#: selling/doctype/installation_note/installation_note.py:120
 msgid "Please pull items from Delivery Note"
 msgstr ""
 
@@ -50674,7 +51649,7 @@
 msgid "Please rectify and try again."
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:253
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:251
 msgid "Please refresh or reset the Plaid linking of the Bank {}."
 msgstr ""
 
@@ -50691,12 +51666,12 @@
 msgid "Please select <b>Template Type</b> to download template"
 msgstr ""
 
-#: controllers/taxes_and_totals.py:652
+#: controllers/taxes_and_totals.py:653
 #: public/js/controllers/taxes_and_totals.js:688
 msgid "Please select Apply Discount On"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:1492
+#: selling/doctype/sales_order/sales_order.py:1484
 msgid "Please select BOM against item {0}"
 msgstr ""
 
@@ -50704,7 +51679,7 @@
 msgid "Please select BOM for Item in Row {0}"
 msgstr ""
 
-#: controllers/buying_controller.py:416
+#: controllers/buying_controller.py:410
 msgid "Please select BOM in BOM field for Item {0}"
 msgstr ""
 
@@ -50726,7 +51701,7 @@
 msgid "Please select Company and Posting Date to getting entries"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:688
+#: accounts/doctype/journal_entry/journal_entry.js:691
 #: manufacturing/doctype/plant_floor/plant_floor.js:12
 msgid "Please select Company first"
 msgstr ""
@@ -50740,7 +51715,7 @@
 msgid "Please select Customer first"
 msgstr ""
 
-#: setup/doctype/company/company.py:406
+#: setup/doctype/company/company.py:398
 msgid "Please select Existing Company for creating Chart of Accounts"
 msgstr ""
 
@@ -50768,50 +51743,50 @@
 msgid "Please select Posting Date before selecting Party"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:689
+#: accounts/doctype/journal_entry/journal_entry.js:692
 msgid "Please select Posting Date first"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1004
+#: manufacturing/doctype/bom/bom.py:999
 msgid "Please select Price List"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:1494
+#: selling/doctype/sales_order/sales_order.py:1486
 msgid "Please select Qty against item {0}"
 msgstr ""
 
-#: stock/doctype/item/item.py:320
+#: stock/doctype/item/item.py:319
 msgid "Please select Sample Retention Warehouse in Stock Settings first"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:323
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:321
 msgid "Please select Serial/Batch Nos to reserve or change Reservation Based On to Qty."
 msgstr ""
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:231
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:230
 msgid "Please select Start Date and End Date for Item {0}"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1211
+#: stock/doctype/stock_entry/stock_entry.py:1220
 msgid "Please select Subcontracting Order instead of Purchase Order {0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:2380
+#: controllers/accounts_controller.py:2359
 msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1228
+#: manufacturing/doctype/bom/bom.py:1221
 msgid "Please select a BOM"
 msgstr ""
 
-#: accounts/party.py:399
+#: accounts/party.py:383
 msgid "Please select a Company"
 msgstr ""
 
 #: accounts/doctype/payment_entry/payment_entry.js:198
-#: manufacturing/doctype/bom/bom.js:499 manufacturing/doctype/bom/bom.py:245
+#: manufacturing/doctype/bom/bom.js:499 manufacturing/doctype/bom/bom.py:242
 #: public/js/controllers/accounts.js:249
-#: public/js/controllers/transaction.js:2537
+#: public/js/controllers/transaction.js:2536
 msgid "Please select a Company first."
 msgstr ""
 
@@ -50835,7 +51810,7 @@
 msgid "Please select a Warehouse"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:1084
+#: manufacturing/doctype/job_card/job_card.py:1072
 msgid "Please select a Work Order first."
 msgstr ""
 
@@ -50883,7 +51858,7 @@
 msgid "Please select a value for {0} quotation_to {1}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:1574
+#: accounts/doctype/journal_entry/journal_entry.py:1562
 msgid "Please select correct account"
 msgstr ""
 
@@ -50896,7 +51871,7 @@
 msgid "Please select either the Item or Warehouse filter to generate the report."
 msgstr ""
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:229
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:228
 msgid "Please select item code"
 msgstr ""
 
@@ -50932,7 +51907,7 @@
 msgid "Please select the required filters"
 msgstr ""
 
-#: support/doctype/service_level_agreement/service_level_agreement.py:196
+#: support/doctype/service_level_agreement/service_level_agreement.py:200
 msgid "Please select valid document type."
 msgstr ""
 
@@ -50940,13 +51915,13 @@
 msgid "Please select weekly off day"
 msgstr ""
 
-#: public/js/utils.js:961
+#: public/js/utils.js:959
 msgid "Please select {0}"
 msgstr ""
 
 #: accounts/doctype/payment_entry/payment_entry.js:1202
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:580
-#: accounts/doctype/tax_withholding_category/tax_withholding_category.py:81
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:577
+#: accounts/doctype/tax_withholding_category/tax_withholding_category.py:79
 msgid "Please select {0} first"
 msgstr ""
 
@@ -50954,11 +51929,11 @@
 msgid "Please set 'Apply Additional Discount On'"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:788
+#: assets/doctype/asset/depreciation.py:771
 msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:785
+#: assets/doctype/asset/depreciation.py:769
 msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
 msgstr ""
 
@@ -50966,7 +51941,7 @@
 msgid "Please set Account"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1525
+#: accounts/doctype/sales_invoice/sales_invoice.py:1532
 msgid "Please set Account for Change Amount"
 msgstr ""
 
@@ -50974,7 +51949,7 @@
 msgid "Please set Account in Warehouse {0} or Default Inventory Account in Company {1}"
 msgstr ""
 
-#: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:277
+#: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:281
 msgid "Please set Accounting Dimension {} in {}"
 msgstr ""
 
@@ -50992,7 +51967,7 @@
 msgid "Please set Company"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:370
+#: assets/doctype/asset/depreciation.py:363
 msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
 msgstr ""
 
@@ -51010,11 +51985,11 @@
 msgid "Please set Fiscal Code for the public administration '%s'"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:551
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:555
 msgid "Please set Fixed Asset Account in {} against {}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:437
+#: assets/doctype/asset/asset.py:434
 msgid "Please set Number of Depreciations Booked"
 msgstr ""
 
@@ -51036,7 +52011,7 @@
 msgid "Please set VAT Accounts in {0}"
 msgstr ""
 
-#: regional/united_arab_emirates/utils.py:63
+#: regional/united_arab_emirates/utils.py:61
 msgid "Please set Vat Accounts for Company: \"{0}\" in UAE VAT Settings"
 msgstr ""
 
@@ -51044,23 +52019,23 @@
 msgid "Please set a Company"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:264
+#: assets/doctype/asset/asset.py:262
 msgid "Please set a Cost Center for the Asset or set an Asset Depreciation Cost Center for the Company {}"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:1283
+#: selling/doctype/sales_order/sales_order.py:1278
 msgid "Please set a Supplier against the Items to be considered in the Purchase Order."
 msgstr ""
 
-#: projects/doctype/project/project.py:738
+#: projects/doctype/project/project.py:736
 msgid "Please set a default Holiday List for Company {0}"
 msgstr ""
 
-#: setup/doctype/employee/employee.py:289
+#: setup/doctype/employee/employee.py:281
 msgid "Please set a default Holiday List for Employee {0} or Company {1}"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1019
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1025
 msgid "Please set account in Warehouse {0}"
 msgstr ""
 
@@ -51069,7 +52044,7 @@
 msgid "Please set an Address on the Company '%s'"
 msgstr ""
 
-#: controllers/stock_controller.py:516
+#: controllers/stock_controller.py:531
 msgid "Please set an Expense Account in the Items table"
 msgstr ""
 
@@ -51081,27 +52056,27 @@
 msgid "Please set at least one row in the Taxes and Charges Table"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2010
+#: accounts/doctype/sales_invoice/sales_invoice.py:2020
 msgid "Please set default Cash or Bank account in Mode of Payment {0}"
 msgstr ""
 
 #: accounts/doctype/pos_opening_entry/pos_opening_entry.py:66
 #: accounts/doctype/pos_profile/pos_profile.py:163
-#: accounts/doctype/sales_invoice/sales_invoice.py:2568
+#: accounts/doctype/sales_invoice/sales_invoice.py:2573
 msgid "Please set default Cash or Bank account in Mode of Payment {}"
 msgstr ""
 
 #: accounts/doctype/pos_opening_entry/pos_opening_entry.py:68
 #: accounts/doctype/pos_profile/pos_profile.py:165
-#: accounts/doctype/sales_invoice/sales_invoice.py:2570
+#: accounts/doctype/sales_invoice/sales_invoice.py:2575
 msgid "Please set default Cash or Bank account in Mode of Payments {}"
 msgstr ""
 
-#: accounts/utils.py:2054
+#: accounts/utils.py:2012
 msgid "Please set default Exchange Gain/Loss Account in Company {}"
 msgstr ""
 
-#: assets/doctype/asset_repair/asset_repair.py:331
+#: assets/doctype/asset_repair/asset_repair.py:327
 msgid "Please set default Expense Account in Company {0}"
 msgstr ""
 
@@ -51109,11 +52084,11 @@
 msgid "Please set default UOM in Stock Settings"
 msgstr ""
 
-#: controllers/stock_controller.py:386
+#: controllers/stock_controller.py:403
 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer"
 msgstr ""
 
-#: accounts/utils.py:955
+#: accounts/utils.py:935
 msgid "Please set default {0} in Company {1}"
 msgstr ""
 
@@ -51130,11 +52105,11 @@
 msgid "Please set filters"
 msgstr ""
 
-#: controllers/accounts_controller.py:1988
+#: controllers/accounts_controller.py:1972
 msgid "Please set one of the following:"
 msgstr ""
 
-#: public/js/controllers/transaction.js:2010
+#: public/js/controllers/transaction.js:2011
 msgid "Please set recurring after saving"
 msgstr ""
 
@@ -51150,11 +52125,11 @@
 msgid "Please set the Item Code first"
 msgstr ""
 
-#: regional/italy/utils.py:333
+#: regional/italy/utils.py:335
 msgid "Please set the Payment Schedule"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:165
+#: accounts/doctype/gl_entry/gl_entry.py:170
 msgid "Please set the cost center field in {0} or setup a default Cost Center for the Company."
 msgstr ""
 
@@ -51175,7 +52150,7 @@
 msgid "Please set {0} for address {1}"
 msgstr ""
 
-#: manufacturing/doctype/bom_creator/bom_creator.py:200
+#: manufacturing/doctype/bom_creator/bom_creator.py:198
 msgid "Please set {0} in BOM Creator {1}"
 msgstr ""
 
@@ -51183,15 +52158,15 @@
 msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:422
+#: assets/doctype/asset/depreciation.py:415
 msgid "Please share this email with your support team so that they can find and fix the issue."
 msgstr ""
 
-#: public/js/controllers/transaction.js:1880
+#: public/js/controllers/transaction.js:1881
 msgid "Please specify"
 msgstr ""
 
-#: stock/get_item_details.py:215
+#: stock/get_item_details.py:210
 msgid "Please specify Company"
 msgstr ""
 
@@ -51202,7 +52177,7 @@
 msgstr ""
 
 #: accounts/doctype/payment_entry/payment_entry.js:1452
-#: controllers/accounts_controller.py:2596 public/js/controllers/accounts.js:97
+#: controllers/accounts_controller.py:2571 public/js/controllers/accounts.js:97
 msgid "Please specify a valid Row ID for row {0} in table {1}"
 msgstr ""
 
@@ -51214,7 +52189,7 @@
 msgid "Please specify at least one attribute in the Attributes table"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:426
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:429
 msgid "Please specify either Quantity or Valuation Rate or both"
 msgstr ""
 
@@ -51226,7 +52201,7 @@
 msgid "Please supply the specified items at the best possible rates"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:218
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:215
 msgid "Please try again in an hour."
 msgstr ""
 
@@ -51259,6 +52234,16 @@
 msgid "Policy number"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Pond"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Pood"
+msgstr ""
+
 #. Name of a DocType
 #: utilities/doctype/portal_user/portal_user.json
 msgid "Portal User"
@@ -51352,24 +52337,24 @@
 
 #: accounts/doctype/payment_entry/payment_entry.js:786
 #: accounts/doctype/payment_reconciliation/payment_reconciliation.js:286
-#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:109
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:110
 #: accounts/report/accounts_payable/accounts_payable.js:16
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:15
 #: accounts/report/accounts_receivable/accounts_receivable.js:18
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:15
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.py:35
 #: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:10
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:64
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:67
-#: accounts/report/general_ledger/general_ledger.py:576
-#: accounts/report/gross_profit/gross_profit.py:212
-#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:183
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:61
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:65
+#: accounts/report/general_ledger/general_ledger.py:567
+#: accounts/report/gross_profit/gross_profit.py:210
+#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:182
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:200
 #: accounts/report/payment_ledger/payment_ledger.py:136
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:97
-#: accounts/report/pos_register/pos_register.py:177
+#: accounts/report/pos_register/pos_register.py:171
 #: accounts/report/purchase_register/purchase_register.py:169
-#: accounts/report/sales_register/sales_register.py:183
+#: accounts/report/sales_register/sales_register.py:184
 #: manufacturing/report/job_card_summary/job_card_summary.py:134
 #: public/js/purchase_trends_filters.js:38
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:25
@@ -51377,13 +52362,13 @@
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:45
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:66
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:85
-#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:132
+#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:131
 #: stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.py:89
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:129
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:108
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:127
+#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:104
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:86
 #: stock/report/serial_no_ledger/serial_no_ledger.py:21
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:114
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:112
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:121
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:34
 #: templates/form_grid/bank_reconciliation_grid.html:6
@@ -51567,7 +52552,7 @@
 msgstr ""
 
 #: stock/doctype/purchase_receipt/purchase_receipt.py:247
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:127
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:125
 msgid "Posting Date cannot be future date"
 msgstr ""
 
@@ -51577,13 +52562,13 @@
 msgid "Posting Datetime"
 msgstr ""
 
-#: accounts/report/gross_profit/gross_profit.py:218
-#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:137
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:130
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:109
+#: accounts/report/gross_profit/gross_profit.py:216
+#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:136
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:128
+#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:105
 #: stock/report/serial_no_ledger/serial_no_ledger.js:63
 #: stock/report/serial_no_ledger/serial_no_ledger.py:22
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:115
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:113
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:126
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:39
 msgid "Posting Time"
@@ -51679,11 +52664,11 @@
 msgid "Posting Time"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1650
+#: stock/doctype/stock_entry/stock_entry.py:1670
 msgid "Posting date and posting time is mandatory"
 msgstr ""
 
-#: controllers/sales_and_purchase_return.py:53
+#: controllers/sales_and_purchase_return.py:51
 msgid "Posting timestamp must be after {0}"
 msgstr ""
 
@@ -51692,6 +52677,46 @@
 msgid "Potential Sales Deal"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Pound"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Pound-Force"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Pound/Cubic Foot"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Pound/Cubic Inch"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Pound/Cubic Yard"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Pound/Gallon (UK)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Pound/Gallon (US)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Poundal"
+msgstr ""
+
 #: accounts/doctype/item_tax_template/item_tax_template_dashboard.py:8
 #: accounts/doctype/shipping_rule/shipping_rule_dashboard.py:9
 #: accounts/doctype/tax_category/tax_category_dashboard.py:8
@@ -51817,7 +52842,7 @@
 msgstr ""
 
 #: accounts/report/balance_sheet/balance_sheet.py:169
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:142
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:138
 msgid "Previous Financial Year is not closed"
 msgstr ""
 
@@ -51827,11 +52852,11 @@
 msgid "Previous Work Experience"
 msgstr ""
 
-#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:153
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:152
 msgid "Previous Year is not closed, please close it first"
 msgstr ""
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:225
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:221
 msgid "Price"
 msgstr ""
 
@@ -51842,7 +52867,7 @@
 msgid "Price"
 msgstr ""
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:246
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:242
 msgid "Price ({0})"
 msgstr ""
 
@@ -52038,7 +53063,7 @@
 msgid "Price List Currency"
 msgstr ""
 
-#: stock/get_item_details.py:1040
+#: stock/get_item_details.py:1010
 msgid "Price List Currency not selected"
 msgstr ""
 
@@ -52248,7 +53273,7 @@
 msgid "Price Not UOM Dependent"
 msgstr ""
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:253
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:249
 msgid "Price Per Unit ({0})"
 msgstr ""
 
@@ -52256,7 +53281,7 @@
 msgid "Price is not set for the item."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:460
+#: manufacturing/doctype/bom/bom.py:454
 msgid "Price not found for item {0} in price list {1}"
 msgstr ""
 
@@ -52270,7 +53295,7 @@
 msgid "Price or product discount slabs are required"
 msgstr ""
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:239
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:235
 msgid "Price per Unit (Stock UOM)"
 msgstr ""
 
@@ -52399,7 +53424,7 @@
 msgid "Pricing Rule Item Group"
 msgstr ""
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:210
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:208
 msgid "Pricing Rule {0} is updated"
 msgstr ""
 
@@ -53050,11 +54075,11 @@
 msgid "Priority cannot be lesser than 1."
 msgstr ""
 
-#: support/doctype/service_level_agreement/service_level_agreement.py:755
+#: support/doctype/service_level_agreement/service_level_agreement.py:754
 msgid "Priority has been changed to {0}."
 msgstr ""
 
-#: support/doctype/service_level_agreement/service_level_agreement.py:105
+#: support/doctype/service_level_agreement/service_level_agreement.py:109
 msgid "Priority {0} has been repeated."
 msgstr ""
 
@@ -53127,9 +54152,9 @@
 msgid "Process Description"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.py:328
-#: erpnext_integrations/doctype/tally_migration/tally_migration.py:414
-#: erpnext_integrations/doctype/tally_migration/tally_migration.py:589
+#: erpnext_integrations/doctype/tally_migration/tally_migration.py:334
+#: erpnext_integrations/doctype/tally_migration/tally_migration.py:420
+#: erpnext_integrations/doctype/tally_migration/tally_migration.py:595
 msgid "Process Failed"
 msgstr ""
 
@@ -53145,11 +54170,11 @@
 msgid "Process Loss"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:987
+#: manufacturing/doctype/bom/bom.py:982
 msgid "Process Loss Percentage cannot be greater than 100"
 msgstr ""
 
-#: manufacturing/report/process_loss_report/process_loss_report.py:95
+#: manufacturing/report/process_loss_report/process_loss_report.py:94
 msgid "Process Loss Qty"
 msgstr ""
 
@@ -53188,7 +54213,7 @@
 msgid "Process Loss Report"
 msgstr ""
 
-#: manufacturing/report/process_loss_report/process_loss_report.py:101
+#: manufacturing/report/process_loss_report/process_loss_report.py:100
 msgid "Process Loss Value"
 msgstr ""
 
@@ -53268,15 +54293,15 @@
 msgid "Processes"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.py:306
+#: erpnext_integrations/doctype/tally_migration/tally_migration.py:312
 msgid "Processing Chart of Accounts and Parties"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.py:312
+#: erpnext_integrations/doctype/tally_migration/tally_migration.py:318
 msgid "Processing Items and UOMs"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.py:309
+#: erpnext_integrations/doctype/tally_migration/tally_migration.py:315
 msgid "Processing Party Addresses"
 msgstr ""
 
@@ -53284,7 +54309,7 @@
 msgid "Processing Sales! Please Wait..."
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.py:580
+#: erpnext_integrations/doctype/tally_migration/tally_migration.py:586
 msgid "Processing Vouchers"
 msgstr ""
 
@@ -53353,7 +54378,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: public/js/controllers/buying.js:260 public/js/controllers/buying.js:508
+#: public/js/controllers/buying.js:260 public/js/controllers/buying.js:502
 #: selling/doctype/product_bundle/product_bundle.json
 msgid "Product Bundle"
 msgstr ""
@@ -53457,7 +54482,7 @@
 
 #. Label of a Card Break in the Manufacturing Workspace
 #: manufacturing/workspace/manufacturing/manufacturing.json
-#: setup/doctype/company/company.py:346
+#: setup/doctype/company/company.py:338
 msgid "Production"
 msgstr ""
 
@@ -53665,7 +54690,7 @@
 msgid "Profit & Loss"
 msgstr ""
 
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:106
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:104
 msgid "Profit This Year"
 msgstr ""
 
@@ -53700,8 +54725,8 @@
 msgid "Profit and Loss Summary"
 msgstr ""
 
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:132
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:133
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:130
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:131
 msgid "Profit for the year"
 msgstr ""
 
@@ -53740,18 +54765,18 @@
 #: accounts/doctype/sales_invoice/sales_invoice.js:1049
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:73
 #: accounts/report/general_ledger/general_ledger.js:162
-#: accounts/report/general_ledger/general_ledger.py:647
-#: accounts/report/gross_profit/gross_profit.py:300
-#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:220
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:265
+#: accounts/report/general_ledger/general_ledger.py:638
+#: accounts/report/gross_profit/gross_profit.py:298
+#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:224
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:270
 #: accounts/report/purchase_register/purchase_register.py:207
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:73
-#: accounts/report/sales_register/sales_register.py:228
+#: accounts/report/sales_register/sales_register.py:229
 #: accounts/report/trial_balance/trial_balance.js:64
 #: buying/report/procurement_tracker/procurement_tracker.js:21
 #: buying/report/procurement_tracker/procurement_tracker.py:39
 #: buying/report/purchase_order_analysis/purchase_order_analysis.js:33
-#: buying/report/purchase_order_analysis/purchase_order_analysis.py:182
+#: buying/report/purchase_order_analysis/purchase_order_analysis.py:178
 #: projects/doctype/project/project.json
 #: projects/doctype/project/project_dashboard.py:11
 #: projects/doctype/task/task_calendar.js:19
@@ -54073,7 +55098,7 @@
 msgid "Project"
 msgstr ""
 
-#: projects/doctype/project/project.py:349
+#: projects/doctype/project/project.py:350
 msgid "Project Collaboration Invitation"
 msgstr ""
 
@@ -54220,7 +55245,7 @@
 msgid "Project wise Stock Tracking "
 msgstr ""
 
-#: controllers/trends.py:380
+#: controllers/trends.py:374
 msgid "Project-wise data is not available for Quotation"
 msgstr ""
 
@@ -54389,7 +55414,7 @@
 msgid "Proposal Writing"
 msgstr ""
 
-#: setup/setup_wizard/operations/install_fixtures.py:395
+#: setup/setup_wizard/operations/install_fixtures.py:387
 msgid "Proposal/Price Quote"
 msgstr ""
 
@@ -54439,11 +55464,11 @@
 msgid "Prospect Owner"
 msgstr ""
 
-#: crm/doctype/lead/lead.py:317
+#: crm/doctype/lead/lead.py:311
 msgid "Prospect {0} already exists"
 msgstr ""
 
-#: setup/setup_wizard/operations/install_fixtures.py:389
+#: setup/setup_wizard/operations/install_fixtures.py:381
 msgid "Prospecting"
 msgstr ""
 
@@ -54487,10 +55512,15 @@
 
 #: accounts/report/balance_sheet/balance_sheet.py:146
 #: accounts/report/balance_sheet/balance_sheet.py:147
-#: accounts/report/balance_sheet/balance_sheet.py:215
+#: accounts/report/balance_sheet/balance_sheet.py:214
 msgid "Provisional Profit / Loss (Credit)"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Psi/1000 Feet"
+msgstr ""
+
 #. Label of a Date field in DocType 'Video'
 #: utilities/doctype/video/video.json
 msgctxt "Video"
@@ -54507,7 +55537,7 @@
 #: accounts/doctype/shipping_rule/shipping_rule_dashboard.py:11
 #: accounts/doctype/tax_category/tax_category_dashboard.py:10
 #: projects/doctype/project/project_dashboard.py:16
-#: setup/doctype/company/company.py:334
+#: setup/doctype/company/company.py:326
 msgid "Purchase"
 msgstr ""
 
@@ -54575,7 +55605,7 @@
 msgstr ""
 
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:188
-#: assets/report/fixed_asset_register/fixed_asset_register.py:425
+#: assets/report/fixed_asset_register/fixed_asset_register.py:415
 msgid "Purchase Date"
 msgstr ""
 
@@ -54601,8 +55631,8 @@
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 #: accounts/print_format/purchase_auditing_voucher/purchase_auditing_voucher.html:5
 #: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:22
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:54
-#: buying/doctype/purchase_order/purchase_order.js:378
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:52
+#: buying/doctype/purchase_order/purchase_order.js:382
 #: buying/doctype/purchase_order/purchase_order_list.js:57
 #: buying/doctype/supplier_quotation/supplier_quotation_list.js:18
 #: stock/doctype/purchase_receipt/purchase_receipt.js:123
@@ -54731,16 +55761,16 @@
 msgid "Purchase Invoice Trends"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:215
+#: assets/doctype/asset/asset.py:214
 msgid "Purchase Invoice cannot be made against an existing asset {0}"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:390
-#: stock/doctype/purchase_receipt/purchase_receipt.py:404
+#: stock/doctype/purchase_receipt/purchase_receipt.py:386
+#: stock/doctype/purchase_receipt/purchase_receipt.py:400
 msgid "Purchase Invoice {0} is already submitted"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1828
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1825
 msgid "Purchase Invoices"
 msgstr ""
 
@@ -54774,15 +55804,15 @@
 
 #. Name of a DocType
 #: accounts/doctype/purchase_invoice/purchase_invoice.js:155
-#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:234
+#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:238
 #: accounts/report/purchase_register/purchase_register.py:216
 #: buying/doctype/purchase_order/purchase_order.json
 #: buying/doctype/supplier_quotation/supplier_quotation.js:25
 #: buying/doctype/supplier_quotation/supplier_quotation_list.js:14
 #: buying/report/procurement_tracker/procurement_tracker.py:82
 #: buying/report/purchase_order_analysis/purchase_order_analysis.js:40
-#: buying/report/purchase_order_analysis/purchase_order_analysis.py:167
-#: controllers/buying_controller.py:649
+#: buying/report/purchase_order_analysis/purchase_order_analysis.py:163
+#: controllers/buying_controller.py:646
 #: manufacturing/doctype/blanket_order/blanket_order.js:54
 #: selling/doctype/sales_order/sales_order.js:136
 #: selling/doctype/sales_order/sales_order.js:659
@@ -54958,7 +55988,7 @@
 msgid "Purchase Order Item Supplied"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:685
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:695
 msgid "Purchase Order Item reference is missing in Subcontracting Receipt {0}"
 msgstr ""
 
@@ -54972,11 +56002,11 @@
 msgid "Purchase Order Pricing Rule"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:583
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:588
 msgid "Purchase Order Required"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:580
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:583
 msgid "Purchase Order Required for item {}"
 msgstr ""
 
@@ -54996,11 +56026,11 @@
 msgid "Purchase Order number required for Item {0}"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:622
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:626
 msgid "Purchase Order {0} is not submitted"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:827
+#: buying/doctype/purchase_order/purchase_order.py:830
 msgid "Purchase Orders"
 msgstr ""
 
@@ -55026,7 +56056,7 @@
 msgid "Purchase Orders to Receive"
 msgstr ""
 
-#: controllers/accounts_controller.py:1606
+#: controllers/accounts_controller.py:1615
 msgid "Purchase Orders {0} are un-linked"
 msgstr ""
 
@@ -55039,7 +56069,7 @@
 #: accounts/doctype/purchase_invoice/purchase_invoice.js:650
 #: accounts/doctype/purchase_invoice/purchase_invoice.js:660
 #: accounts/doctype/purchase_invoice/purchase_invoice_list.js:48
-#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:241
+#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:245
 #: accounts/report/purchase_register/purchase_register.py:223
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:20
 #: buying/doctype/purchase_order/purchase_order.js:352
@@ -55162,11 +56192,11 @@
 msgid "Purchase Receipt No"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:605
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:609
 msgid "Purchase Receipt Required"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:600
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:604
 msgid "Purchase Receipt Required for item {}"
 msgstr ""
 
@@ -55183,11 +56213,11 @@
 msgid "Purchase Receipt doesn't have any Item for which Retain Sample is enabled."
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:703
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:713
 msgid "Purchase Receipt {0} created."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:628
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:633
 msgid "Purchase Receipt {0} is not submitted"
 msgstr ""
 
@@ -55347,7 +56377,7 @@
 msgid "Purchase an Asset Item"
 msgstr ""
 
-#: utilities/activation.py:106
+#: utilities/activation.py:104
 msgid "Purchase orders help you plan and follow up on your purchases"
 msgstr ""
 
@@ -55357,7 +56387,7 @@
 msgid "Purchased"
 msgstr ""
 
-#: regional/report/vat_audit_report/vat_audit_report.py:184
+#: regional/report/vat_audit_report/vat_audit_report.py:180
 msgid "Purchases"
 msgstr ""
 
@@ -55431,7 +56461,7 @@
 msgid "Purpose"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:335
+#: stock/doctype/stock_entry/stock_entry.py:332
 msgid "Purpose must be one of {0}"
 msgstr ""
 
@@ -55466,23 +56496,23 @@
 msgid "Putaway Rule already exists for Item {0} in Warehouse {1}."
 msgstr ""
 
-#: accounts/report/gross_profit/gross_profit.py:257
-#: buying/report/purchase_order_analysis/purchase_order_analysis.py:204
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:226
-#: controllers/trends.py:240 controllers/trends.py:252
-#: controllers/trends.py:257
+#: accounts/report/gross_profit/gross_profit.py:255
+#: buying/report/purchase_order_analysis/purchase_order_analysis.py:200
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:224
+#: controllers/trends.py:236 controllers/trends.py:248
+#: controllers/trends.py:253
 #: manufacturing/report/bom_explorer/bom_explorer.py:57
 #: public/js/bom_configurator/bom_configurator.bundle.js:110
 #: public/js/bom_configurator/bom_configurator.bundle.js:209
 #: public/js/bom_configurator/bom_configurator.bundle.js:280
 #: public/js/bom_configurator/bom_configurator.bundle.js:303
 #: public/js/bom_configurator/bom_configurator.bundle.js:382
-#: public/js/utils.js:722 selling/doctype/sales_order/sales_order.js:340
+#: public/js/utils.js:720 selling/doctype/sales_order/sales_order.js:340
 #: selling/doctype/sales_order/sales_order.js:440
 #: selling/doctype/sales_order/sales_order.js:802
 #: selling/doctype/sales_order/sales_order.js:951
 #: selling/report/sales_order_analysis/sales_order_analysis.py:255
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:166
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:164
 #: stock/report/serial_no_ledger/serial_no_ledger.py:70
 #: templates/form_grid/item_grid.html:7
 #: templates/form_grid/material_request_grid.html:9
@@ -55649,7 +56679,7 @@
 msgid "Qty As Per BOM"
 msgstr ""
 
-#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:170
+#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:169
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:165
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:89
 msgid "Qty Change"
@@ -55679,12 +56709,12 @@
 msgid "Qty In Stock"
 msgstr ""
 
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:76
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:74
 msgid "Qty Per Unit"
 msgstr ""
 
 #: manufacturing/doctype/bom/bom.js:256
-#: manufacturing/report/process_loss_report/process_loss_report.py:83
+#: manufacturing/report/process_loss_report/process_loss_report.py:82
 msgid "Qty To Manufacture"
 msgstr ""
 
@@ -55785,7 +56815,7 @@
 msgid "Qty for {0}"
 msgstr ""
 
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:233
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:231
 msgid "Qty in Stock UOM"
 msgstr ""
 
@@ -55811,7 +56841,7 @@
 msgid "Qty of Finished Goods Item"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:470
+#: stock/doctype/pick_list/pick_list.py:465
 msgid "Qty of Finished Goods Item should be greater than 0."
 msgstr ""
 
@@ -55828,7 +56858,7 @@
 msgid "Qty to Be Consumed"
 msgstr ""
 
-#: buying/report/purchase_order_analysis/purchase_order_analysis.py:232
+#: buying/report/purchase_order_analysis/purchase_order_analysis.py:228
 #: selling/report/sales_order_analysis/sales_order_analysis.py:283
 msgid "Qty to Bill"
 msgstr ""
@@ -55845,13 +56875,13 @@
 msgid "Qty to Fetch"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:675
+#: manufacturing/doctype/job_card/job_card.py:670
 #: manufacturing/doctype/workstation/workstation_job_card.html:56
 msgid "Qty to Manufacture"
 msgstr ""
 
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:170
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:261
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:168
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:259
 msgid "Qty to Order"
 msgstr ""
 
@@ -55859,12 +56889,12 @@
 msgid "Qty to Produce"
 msgstr ""
 
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:173
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:254
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:171
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:252
 msgid "Qty to Receive"
 msgstr ""
 
-#: setup/setup_wizard/operations/install_fixtures.py:390
+#: setup/setup_wizard/operations/install_fixtures.py:382
 msgid "Qualification"
 msgstr ""
 
@@ -56192,7 +57222,7 @@
 msgid "Quality Inspection(s)"
 msgstr ""
 
-#: setup/doctype/company/company.py:376
+#: setup/doctype/company/company.py:368
 msgid "Quality Management"
 msgstr ""
 
@@ -56292,12 +57322,12 @@
 #: accounts/report/inactive_sales_items/inactive_sales_items.py:47
 #: buying/report/procurement_tracker/procurement_tracker.py:66
 #: buying/report/purchase_analytics/purchase_analytics.js:28
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:215
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:211
 #: manufacturing/doctype/bom/bom.js:319
 #: manufacturing/doctype/bom_creator/bom_creator.js:68
 #: manufacturing/doctype/plant_floor/plant_floor.js:166
 #: manufacturing/doctype/plant_floor/plant_floor.js:190
-#: public/js/controllers/buying.js:515 public/js/stock_analytics.js:50
+#: public/js/controllers/buying.js:509 public/js/stock_analytics.js:50
 #: public/js/utils/serial_no_batch_selector.js:402
 #: selling/page/point_of_sale/pos_item_cart.js:46
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:42
@@ -56305,7 +57335,7 @@
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:67
 #: stock/dashboard/item_dashboard.js:244
 #: stock/doctype/material_request/material_request.js:314
-#: stock/doctype/stock_entry/stock_entry.js:636
+#: stock/doctype/stock_entry/stock_entry.js:650
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.py:36
 #: stock/report/delayed_item_report/delayed_item_report.py:150
 #: stock/report/stock_analytics/stock_analytics.js:27
@@ -56549,7 +57579,7 @@
 msgid "Quantity and Warehouse"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1279
+#: stock/doctype/stock_entry/stock_entry.py:1288
 msgid "Quantity in row {0} ({1}) must be same as manufactured quantity {2}"
 msgstr ""
 
@@ -56572,11 +57602,11 @@
 msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:623
+#: manufacturing/doctype/bom/bom.py:618
 msgid "Quantity required for Item {0} in row {1}"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:568
+#: manufacturing/doctype/bom/bom.py:563
 #: manufacturing/doctype/workstation/workstation.js:216
 msgid "Quantity should be greater than 0"
 msgstr ""
@@ -56589,11 +57619,11 @@
 msgid "Quantity to Manufacture"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:1530
+#: manufacturing/doctype/work_order/work_order.py:1523
 msgid "Quantity to Manufacture can not be zero for the operation {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:948
+#: manufacturing/doctype/work_order/work_order.py:949
 msgid "Quantity to Manufacture must be greater than 0."
 msgstr ""
 
@@ -56609,8 +57639,23 @@
 msgid "Quantity to Scan"
 msgstr ""
 
-#: selling/report/sales_analytics/sales_analytics.py:320
-#: stock/report/stock_analytics/stock_analytics.py:119
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Quart (UK)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Quart Dry (US)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Quart Liquid (US)"
+msgstr ""
+
+#: selling/report/sales_analytics/sales_analytics.py:311
+#: stock/report/stock_analytics/stock_analytics.py:116
 msgid "Quarter {0} {1}"
 msgstr ""
 
@@ -56726,7 +57771,7 @@
 msgid "Quick Entry"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:577
+#: accounts/doctype/journal_entry/journal_entry.js:580
 msgid "Quick Journal Entry"
 msgstr ""
 
@@ -56752,6 +57797,11 @@
 msgid "Quickbooks Company ID"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Quintal"
+msgstr ""
+
 #: crm/report/campaign_efficiency/campaign_efficiency.py:22
 #: crm/report/lead_owner_efficiency/lead_owner_efficiency.py:28
 msgid "Quot Count"
@@ -56878,20 +57928,20 @@
 msgid "Quotation Trends"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:386
+#: selling/doctype/sales_order/sales_order.py:394
 msgid "Quotation {0} is cancelled"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:303
+#: selling/doctype/sales_order/sales_order.py:307
 msgid "Quotation {0} not of type {1}"
 msgstr ""
 
-#: selling/doctype/quotation/quotation.py:326
+#: selling/doctype/quotation/quotation.py:327
 #: selling/page/sales_funnel/sales_funnel.py:57
 msgid "Quotations"
 msgstr ""
 
-#: utilities/activation.py:88
+#: utilities/activation.py:86
 msgid "Quotations are proposals, bids you have sent to your customers"
 msgstr ""
 
@@ -56905,11 +57955,11 @@
 msgid "Quote Status"
 msgstr ""
 
-#: selling/report/quotation_trends/quotation_trends.py:52
+#: selling/report/quotation_trends/quotation_trends.py:51
 msgid "Quoted Amount"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:88
+#: buying/doctype/request_for_quotation/request_for_quotation.py:87
 msgid "RFQs are not allowed for {0} due to a scorecard standing of {1}"
 msgstr ""
 
@@ -56961,10 +58011,10 @@
 msgstr ""
 
 #: accounts/doctype/pos_closing_entry/closing_voucher_details.html:66
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79
-#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:263
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:315
-#: accounts/report/share_ledger/share_ledger.py:56 public/js/utils.js:732
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:77
+#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:267
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:320
+#: accounts/report/share_ledger/share_ledger.py:56 public/js/utils.js:730
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:45
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:68
 #: stock/dashboard/item_dashboard.js:251
@@ -57586,7 +58636,7 @@
 msgid "Raw Material"
 msgstr ""
 
-#: manufacturing/report/production_planning_report/production_planning_report.py:392
+#: manufacturing/report/production_planning_report/production_planning_report.py:395
 msgid "Raw Material Code"
 msgstr ""
 
@@ -57642,11 +58692,11 @@
 msgid "Raw Material Item Code"
 msgstr ""
 
-#: manufacturing/report/production_planning_report/production_planning_report.py:399
+#: manufacturing/report/production_planning_report/production_planning_report.py:402
 msgid "Raw Material Name"
 msgstr ""
 
-#: manufacturing/report/process_loss_report/process_loss_report.py:108
+#: manufacturing/report/process_loss_report/process_loss_report.py:107
 msgid "Raw Material Value"
 msgstr ""
 
@@ -57738,7 +58788,7 @@
 msgid "Raw Materials Warehouse"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:616
+#: manufacturing/doctype/bom/bom.py:611
 msgid "Raw Materials cannot be blank."
 msgstr ""
 
@@ -57834,8 +58884,8 @@
 msgid "Reading 9"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.py:300
-#: erpnext_integrations/doctype/tally_migration/tally_migration.py:577
+#: erpnext_integrations/doctype/tally_migration/tally_migration.py:306
+#: erpnext_integrations/doctype/tally_migration/tally_migration.py:583
 msgid "Reading Uploaded File"
 msgstr ""
 
@@ -57871,7 +58921,7 @@
 msgid "Reason for Failure"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:661
+#: buying/doctype/purchase_order/purchase_order.js:667
 #: selling/doctype/sales_order/sales_order.js:1274
 msgid "Reason for Hold"
 msgstr ""
@@ -57980,9 +59030,9 @@
 msgstr ""
 
 #: accounts/report/accounts_receivable/accounts_receivable.js:70
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:236
-#: accounts/report/sales_register/sales_register.py:215
-#: accounts/report/sales_register/sales_register.py:269
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:241
+#: accounts/report/sales_register/sales_register.py:216
+#: accounts/report/sales_register/sales_register.py:270
 msgid "Receivable Account"
 msgstr ""
 
@@ -58013,7 +59063,7 @@
 msgid "Receive"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:321
+#: buying/doctype/request_for_quotation/request_for_quotation.py:320
 #: buying/doctype/supplier_quotation/supplier_quotation.py:175
 #: stock/doctype/material_request/material_request_list.js:27
 #: stock/doctype/material_request/material_request_list.js:35
@@ -58057,7 +59107,7 @@
 msgid "Received Amount After Tax (Company Currency)"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:900
+#: accounts/doctype/payment_entry/payment_entry.py:909
 msgid "Received Amount cannot be greater than Paid Amount"
 msgstr ""
 
@@ -58076,10 +59126,10 @@
 msgid "Received On"
 msgstr ""
 
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78
-#: buying/report/purchase_order_analysis/purchase_order_analysis.py:211
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:172
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:247
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:76
+#: buying/report/purchase_order_analysis/purchase_order_analysis.py:207
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:170
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:245
 #: buying/report/subcontract_order_summary/subcontract_order_summary.py:143
 msgid "Received Qty"
 msgstr ""
@@ -58120,7 +59170,7 @@
 msgid "Received Qty"
 msgstr ""
 
-#: buying/report/purchase_order_analysis/purchase_order_analysis.py:263
+#: buying/report/purchase_order_analysis/purchase_order_analysis.py:259
 msgid "Received Qty Amount"
 msgstr ""
 
@@ -58296,7 +59346,7 @@
 msgid "Records"
 msgstr ""
 
-#: regional/united_arab_emirates/utils.py:176
+#: regional/united_arab_emirates/utils.py:171
 msgid "Recoverable Standard Rated expenses should not be set when Reverse Charge Applicable is Y"
 msgstr ""
 
@@ -58410,7 +59460,7 @@
 msgid "Ref Code"
 msgstr ""
 
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:100
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:97
 msgid "Ref Date"
 msgstr ""
 
@@ -58425,7 +59475,7 @@
 #: accounts/report/accounts_receivable/accounts_receivable.html:139
 #: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:12
 #: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:25
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:99
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:96
 #: accounts/report/general_ledger/general_ledger.html:28
 #: buying/doctype/purchase_order/purchase_order_dashboard.py:22
 #: buying/doctype/supplier_quotation/supplier_quotation_dashboard.py:15
@@ -58580,7 +59630,7 @@
 msgid "Reference"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:926
+#: accounts/doctype/journal_entry/journal_entry.py:934
 msgid "Reference #{0} dated {1}"
 msgstr ""
 
@@ -58595,7 +59645,7 @@
 msgid "Reference Date"
 msgstr ""
 
-#: public/js/controllers/transaction.js:2116
+#: public/js/controllers/transaction.js:2117
 msgid "Reference Date for Early Payment Discount"
 msgstr ""
 
@@ -58617,7 +59667,7 @@
 msgid "Reference Doctype"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:564
+#: accounts/doctype/payment_entry/payment_entry.py:570
 msgid "Reference Doctype must be one of {0}"
 msgstr ""
 
@@ -58792,19 +59842,19 @@
 msgid "Reference No"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:548
+#: accounts/doctype/journal_entry/journal_entry.py:547
 msgid "Reference No & Reference Date is required for {0}"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1096
+#: accounts/doctype/payment_entry/payment_entry.py:1104
 msgid "Reference No and Reference Date is mandatory for Bank transaction"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:553
+#: accounts/doctype/journal_entry/journal_entry.py:552
 msgid "Reference No is mandatory if you entered Reference Date"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:256
 msgid "Reference No."
 msgstr ""
 
@@ -58985,15 +60035,15 @@
 msgid "References"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:395
+#: stock/doctype/delivery_note/delivery_note.py:405
 msgid "References to Sales Invoices are Incomplete"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:371
+#: stock/doctype/delivery_note/delivery_note.py:381
 msgid "References to Sales Orders are Incomplete"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:640
+#: accounts/doctype/payment_entry/payment_entry.py:652
 msgid "References {0} of type {1} had no outstanding amount left before submitting the Payment Entry. Now they have a negative outstanding amount."
 msgstr ""
 
@@ -59030,7 +60080,7 @@
 msgid "Refresh Token"
 msgstr ""
 
-#: stock/reorder_item.py:388
+#: stock/reorder_item.py:387
 msgid "Regards,"
 msgstr ""
 
@@ -59205,8 +60255,8 @@
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:186
 #: accounts/report/accounts_receivable/accounts_receivable.html:156
-#: accounts/report/accounts_receivable/accounts_receivable.py:1093
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:181
+#: accounts/report/accounts_receivable/accounts_receivable.py:1083
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:179
 msgid "Remaining Balance"
 msgstr ""
 
@@ -59237,13 +60287,13 @@
 #: accounts/report/accounts_receivable/accounts_receivable.html:159
 #: accounts/report/accounts_receivable/accounts_receivable.html:198
 #: accounts/report/accounts_receivable/accounts_receivable.html:269
-#: accounts/report/accounts_receivable/accounts_receivable.py:1125
+#: accounts/report/accounts_receivable/accounts_receivable.py:1115
 #: accounts/report/general_ledger/general_ledger.html:29
 #: accounts/report/general_ledger/general_ledger.html:51
-#: accounts/report/general_ledger/general_ledger.py:674
+#: accounts/report/general_ledger/general_ledger.py:665
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:116
 #: accounts/report/purchase_register/purchase_register.py:296
-#: accounts/report/sales_register/sales_register.py:333
+#: accounts/report/sales_register/sales_register.py:334
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:95
 msgid "Remarks"
 msgstr ""
@@ -59367,7 +60417,7 @@
 msgid "Remove item if charges is not applicable to that item"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:377
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:380
 msgid "Removed items with no change in quantity or value."
 msgstr ""
 
@@ -59388,7 +60438,7 @@
 msgid "Rename Log"
 msgstr ""
 
-#: accounts/doctype/account/account.py:521
+#: accounts/doctype/account/account.py:516
 msgid "Rename Not Allowed"
 msgstr ""
 
@@ -59397,7 +60447,7 @@
 msgid "Rename Tool"
 msgstr ""
 
-#: accounts/doctype/account/account.py:513
+#: accounts/doctype/account/account.py:508
 msgid "Renaming it is only allowed via parent company {0}, to avoid mismatch."
 msgstr ""
 
@@ -59428,7 +60478,7 @@
 msgid "Reopen"
 msgstr ""
 
-#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:66
+#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:64
 #: stock/report/stock_projected_qty/stock_projected_qty.py:206
 msgid "Reorder Level"
 msgstr ""
@@ -59519,7 +60569,7 @@
 #: crm/report/lead_details/lead_details.js:35
 #: support/report/issue_analytics/issue_analytics.js:56
 #: support/report/issue_summary/issue_summary.js:43
-#: support/report/issue_summary/issue_summary.py:354
+#: support/report/issue_summary/issue_summary.py:366
 msgid "Replied"
 msgstr ""
 
@@ -59583,7 +60633,7 @@
 msgid "Report Type"
 msgstr ""
 
-#: accounts/doctype/account/account.py:414
+#: accounts/doctype/account/account.py:410
 msgid "Report Type is mandatory"
 msgstr ""
 
@@ -59725,7 +60775,7 @@
 msgid "Reposting Progress"
 msgstr ""
 
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:169
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:167
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:304
 msgid "Reposting entries created: {0}"
 msgstr ""
@@ -59807,7 +60857,7 @@
 msgid "Reqd By Date"
 msgstr ""
 
-#: public/js/utils.js:742
+#: public/js/utils.js:740
 msgid "Reqd by date"
 msgstr ""
 
@@ -59845,10 +60895,10 @@
 
 #. Name of a DocType
 #: buying/doctype/request_for_quotation/request_for_quotation.json
-#: buying/doctype/request_for_quotation/request_for_quotation.py:370
+#: buying/doctype/request_for_quotation/request_for_quotation.py:367
 #: buying/doctype/supplier_quotation/supplier_quotation.js:62
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:68
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:274
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:270
 #: stock/doctype/material_request/material_request.js:162
 msgid "Request for Quotation"
 msgstr ""
@@ -59955,8 +61005,8 @@
 msgid "Requestor"
 msgstr ""
 
-#: buying/report/purchase_order_analysis/purchase_order_analysis.py:165
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:193
+#: buying/report/purchase_order_analysis/purchase_order_analysis.py:161
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:191
 msgid "Required By"
 msgstr ""
 
@@ -60039,12 +61089,12 @@
 
 #: buying/report/subcontract_order_summary/subcontract_order_summary.py:151
 #: manufacturing/doctype/workstation/workstation_job_card.html:95
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:88
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:86
 #: manufacturing/report/bom_stock_report/bom_stock_report.html:11
 #: manufacturing/report/bom_stock_report/bom_stock_report.html:21
 #: manufacturing/report/bom_stock_report/bom_stock_report.py:29
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:58
-#: manufacturing/report/production_planning_report/production_planning_report.py:411
+#: manufacturing/report/production_planning_report/production_planning_report.py:414
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:129
 msgid "Required Qty"
 msgstr ""
@@ -60118,7 +61168,7 @@
 msgid "Research"
 msgstr ""
 
-#: setup/doctype/company/company.py:382
+#: setup/doctype/company/company.py:374
 msgid "Research & Development"
 msgstr ""
 
@@ -60258,7 +61308,7 @@
 msgid "Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items."
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:497
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:491
 msgid "Reserved Qty should be greater than Delivered Qty."
 msgstr ""
 
@@ -60274,7 +61324,7 @@
 msgid "Reserved Quantity for Production"
 msgstr ""
 
-#: stock/stock_ledger.py:1989
+#: stock/stock_ledger.py:1955
 msgid "Reserved Serial No."
 msgstr ""
 
@@ -60285,7 +61335,7 @@
 #: stock/dashboard/item_dashboard_list.html:15
 #: stock/doctype/pick_list/pick_list.js:146
 #: stock/report/reserved_stock/reserved_stock.json
-#: stock/report/stock_balance/stock_balance.py:467 stock/stock_ledger.py:1969
+#: stock/report/stock_balance/stock_balance.py:466 stock/stock_ledger.py:1939
 msgid "Reserved Stock"
 msgstr ""
 
@@ -60295,7 +61345,7 @@
 msgid "Reserved Stock"
 msgstr ""
 
-#: stock/stock_ledger.py:2019
+#: stock/stock_ledger.py:1985
 msgid "Reserved Stock for Batch"
 msgstr ""
 
@@ -60448,7 +61498,7 @@
 #: accounts/doctype/dunning/dunning_list.js:4
 #: support/report/issue_analytics/issue_analytics.js:57
 #: support/report/issue_summary/issue_summary.js:45
-#: support/report/issue_summary/issue_summary.py:366
+#: support/report/issue_summary/issue_summary.py:378
 msgid "Resolved"
 msgstr ""
 
@@ -60506,7 +61556,7 @@
 msgid "Response Result Key Path"
 msgstr ""
 
-#: support/doctype/service_level_agreement/service_level_agreement.py:95
+#: support/doctype/service_level_agreement/service_level_agreement.py:99
 msgid "Response Time for {0} priority in row {1} can't be greater than Resolution Time."
 msgstr ""
 
@@ -60522,7 +61572,7 @@
 msgid "Responsible"
 msgstr ""
 
-#: setup/setup_wizard/operations/defaults_setup.py:109
+#: setup/setup_wizard/operations/defaults_setup.py:107
 #: setup/setup_wizard/operations/install_fixtures.py:109
 msgid "Rest Of The World"
 msgstr ""
@@ -60618,7 +61668,7 @@
 msgid "Retention Stock Entry"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.js:510
+#: stock/doctype/stock_entry/stock_entry.js:524
 msgid "Retention Stock Entry already created or Sample Quantity not provided"
 msgstr ""
 
@@ -60836,7 +61886,7 @@
 msgid "Returned Qty in Stock UOM"
 msgstr ""
 
-#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:104
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:101
 msgid "Returned exchange rate is neither integer not float."
 msgstr ""
 
@@ -60974,6 +62024,11 @@
 msgid "Ringing"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Rod"
+msgstr ""
+
 #. Label of a Link field in DocType 'Stock Settings'
 #: stock/doctype/stock_settings/stock_settings.json
 msgctxt "Stock Settings"
@@ -61049,19 +62104,19 @@
 msgid "Root Type"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:399
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:397
 msgid "Root Type for {0} must be one of the Asset, Liability, Income, Expense and Equity"
 msgstr ""
 
-#: accounts/doctype/account/account.py:411
+#: accounts/doctype/account/account.py:407
 msgid "Root Type is mandatory"
 msgstr ""
 
-#: accounts/doctype/account/account.py:214
+#: accounts/doctype/account/account.py:212
 msgid "Root cannot be edited."
 msgstr ""
 
-#: accounts/doctype/cost_center/cost_center.py:49
+#: accounts/doctype/cost_center/cost_center.py:47
 msgid "Root cannot have a parent cost center"
 msgstr ""
 
@@ -61108,7 +62163,7 @@
 msgstr ""
 
 #: accounts/report/purchase_register/purchase_register.py:282
-#: accounts/report/sales_register/sales_register.py:310
+#: accounts/report/sales_register/sales_register.py:311
 msgid "Rounded Total"
 msgstr ""
 
@@ -61339,7 +62394,7 @@
 msgid "Rounding Loss Allowance should be between 0 and 1"
 msgstr ""
 
-#: controllers/stock_controller.py:398 controllers/stock_controller.py:413
+#: controllers/stock_controller.py:415 controllers/stock_controller.py:430
 msgid "Rounding gain/loss Entry for Stock Transfer"
 msgstr ""
 
@@ -61380,62 +62435,62 @@
 msgid "Routing Name"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:482
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:491
 msgid "Row #"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:388
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:391
 msgid "Row # {0}:"
 msgstr ""
 
-#: controllers/sales_and_purchase_return.py:181
+#: controllers/sales_and_purchase_return.py:179
 msgid "Row # {0}: Cannot return more than {1} for Item {2}"
 msgstr ""
 
-#: controllers/sales_and_purchase_return.py:126
+#: controllers/sales_and_purchase_return.py:124
 msgid "Row # {0}: Rate cannot be greater than the rate used in {1} {2}"
 msgstr ""
 
-#: controllers/sales_and_purchase_return.py:111
+#: controllers/sales_and_purchase_return.py:109
 msgid "Row # {0}: Returned Item {1} does not exist in {2} {3}"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.py:439
-#: accounts/doctype/sales_invoice/sales_invoice.py:1684
+#: accounts/doctype/pos_invoice/pos_invoice.py:440
+#: accounts/doctype/sales_invoice/sales_invoice.py:1697
 msgid "Row #{0} (Payment Table): Amount must be negative"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.py:437
-#: accounts/doctype/sales_invoice/sales_invoice.py:1679
+#: accounts/doctype/pos_invoice/pos_invoice.py:438
+#: accounts/doctype/sales_invoice/sales_invoice.py:1692
 msgid "Row #{0} (Payment Table): Amount must be positive"
 msgstr ""
 
-#: stock/doctype/item/item.py:480
+#: stock/doctype/item/item.py:481
 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}."
 msgstr ""
 
-#: stock/doctype/quality_inspection/quality_inspection.py:235
+#: stock/doctype/quality_inspection/quality_inspection.py:233
 msgid "Row #{0}: Acceptance Criteria Formula is incorrect."
 msgstr ""
 
-#: stock/doctype/quality_inspection/quality_inspection.py:215
+#: stock/doctype/quality_inspection/quality_inspection.py:213
 msgid "Row #{0}: Acceptance Criteria Formula is required."
 msgstr ""
 
 #: controllers/subcontracting_controller.py:72
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:414
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:420
 msgid "Row #{0}: Accepted Warehouse and Rejected Warehouse cannot be same"
 msgstr ""
 
-#: controllers/buying_controller.py:231
+#: controllers/buying_controller.py:225
 msgid "Row #{0}: Accepted Warehouse and Supplier Warehouse cannot be same"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:407
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:413
 msgid "Row #{0}: Accepted Warehouse is mandatory for the accepted Item {1}"
 msgstr ""
 
-#: controllers/accounts_controller.py:939
+#: controllers/accounts_controller.py:951
 msgid "Row #{0}: Account {1} does not belong to company {2}"
 msgstr ""
 
@@ -61444,11 +62499,11 @@
 msgid "Row #{0}: Allocated Amount cannot be greater than outstanding amount."
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:401
+#: accounts/doctype/payment_entry/payment_entry.py:403
 msgid "Row #{0}: Allocated amount:{1} is greater than outstanding amount:{2} for Payment Term {3}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:315
+#: assets/doctype/asset_capitalization/asset_capitalization.py:321
 msgid "Row #{0}: Amount must be a positive number"
 msgstr ""
 
@@ -61456,47 +62511,47 @@
 msgid "Row #{0}: Asset {1} cannot be submitted, it is already {2}"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:352
+#: buying/doctype/purchase_order/purchase_order.py:350
 msgid "Row #{0}: BOM is not specified for subcontracting item {0}"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:313
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:311
 msgid "Row #{0}: Batch No {1} is already selected."
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:745
+#: accounts/doctype/payment_entry/payment_entry.py:757
 msgid "Row #{0}: Cannot allocate more than {1} against payment term {2}"
 msgstr ""
 
-#: controllers/accounts_controller.py:3155
+#: controllers/accounts_controller.py:3119
 msgid "Row #{0}: Cannot delete item {1} which has already been billed."
 msgstr ""
 
-#: controllers/accounts_controller.py:3129
+#: controllers/accounts_controller.py:3093
 msgid "Row #{0}: Cannot delete item {1} which has already been delivered"
 msgstr ""
 
-#: controllers/accounts_controller.py:3148
+#: controllers/accounts_controller.py:3112
 msgid "Row #{0}: Cannot delete item {1} which has already been received"
 msgstr ""
 
-#: controllers/accounts_controller.py:3135
+#: controllers/accounts_controller.py:3099
 msgid "Row #{0}: Cannot delete item {1} which has work order assigned to it."
 msgstr ""
 
-#: controllers/accounts_controller.py:3141
+#: controllers/accounts_controller.py:3105
 msgid "Row #{0}: Cannot delete item {1} which is assigned to customer's purchase order."
 msgstr ""
 
-#: controllers/buying_controller.py:236
+#: controllers/buying_controller.py:230
 msgid "Row #{0}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor"
 msgstr ""
 
-#: controllers/accounts_controller.py:3400
+#: controllers/accounts_controller.py:3361
 msgid "Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}."
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:871
+#: manufacturing/doctype/job_card/job_card.py:861
 msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}"
 msgstr ""
 
@@ -61508,23 +62563,23 @@
 msgid "Row #{0}: Clearance date {1} cannot be before Cheque Date {2}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:292
+#: assets/doctype/asset_capitalization/asset_capitalization.py:296
 msgid "Row #{0}: Consumed Asset {1} cannot be Draft"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:294
+#: assets/doctype/asset_capitalization/asset_capitalization.py:299
 msgid "Row #{0}: Consumed Asset {1} cannot be cancelled"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:279
+#: assets/doctype/asset_capitalization/asset_capitalization.py:281
 msgid "Row #{0}: Consumed Asset {1} cannot be the same as the Target Asset"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:288
+#: assets/doctype/asset_capitalization/asset_capitalization.py:290
 msgid "Row #{0}: Consumed Asset {1} cannot be {2}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:298
+#: assets/doctype/asset_capitalization/asset_capitalization.py:304
 msgid "Row #{0}: Consumed Asset {1} does not belong to company {2}"
 msgstr ""
 
@@ -61532,7 +62587,7 @@
 msgid "Row #{0}: Cost Center {1} does not belong to company {2}"
 msgstr ""
 
-#: accounts/doctype/tax_withholding_category/tax_withholding_category.py:64
+#: accounts/doctype/tax_withholding_category/tax_withholding_category.py:62
 msgid "Row #{0}: Cumulative threshold cannot be less than Single Transaction threshold"
 msgstr ""
 
@@ -61540,7 +62595,7 @@
 msgid "Row #{0}: Dates overlapping with other row"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:376
+#: buying/doctype/purchase_order/purchase_order.py:374
 msgid "Row #{0}: Default BOM not found for FG Item {1}"
 msgstr ""
 
@@ -61552,7 +62607,7 @@
 msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
 msgstr ""
 
-#: controllers/stock_controller.py:518
+#: controllers/stock_controller.py:533
 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
 msgstr ""
 
@@ -61560,23 +62615,23 @@
 msgid "Row #{0}: Finished Good Item Qty can not be zero"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:363
+#: buying/doctype/purchase_order/purchase_order.py:361
 msgid "Row #{0}: Finished Good Item is not specified for service item {1}"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:370
+#: buying/doctype/purchase_order/purchase_order.py:368
 msgid "Row #{0}: Finished Good Item {1} must be a sub-contracted item"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:395
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:401
 msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:594
+#: accounts/doctype/journal_entry/journal_entry.py:595
 msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:604
+#: accounts/doctype/journal_entry/journal_entry.py:605
 msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
 msgstr ""
 
@@ -61588,43 +62643,43 @@
 msgid "Row #{0}: Item added"
 msgstr ""
 
-#: buying/utils.py:93
+#: buying/utils.py:92
 msgid "Row #{0}: Item {1} does not exist"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:951
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:937
 msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:545
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:553
 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it."
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:309
+#: assets/doctype/asset_capitalization/asset_capitalization.py:315
 msgid "Row #{0}: Item {1} is not a service item"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:267
+#: assets/doctype/asset_capitalization/asset_capitalization.py:269
 msgid "Row #{0}: Item {1} is not a stock item"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:666
+#: accounts/doctype/payment_entry/payment_entry.py:678
 msgid "Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher"
 msgstr ""
 
-#: stock/doctype/item/item.py:351
+#: stock/doctype/item/item.py:350
 msgid "Row #{0}: Maximum Net Rate cannot be greater than Minimum Net Rate"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:541
+#: selling/doctype/sales_order/sales_order.py:547
 msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1034
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1020
 msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:642
+#: stock/doctype/stock_entry/stock_entry.py:643
 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}."
 msgstr ""
 
@@ -61632,23 +62687,23 @@
 msgid "Row #{0}: Payment document is required to complete the transaction"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:901
+#: manufacturing/doctype/production_plan/production_plan.py:902
 msgid "Row #{0}: Please select Item Code in Assembly Items"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:904
+#: manufacturing/doctype/production_plan/production_plan.py:905
 msgid "Row #{0}: Please select the BOM No in Assembly Items"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:898
+#: manufacturing/doctype/production_plan/production_plan.py:899
 msgid "Row #{0}: Please select the Sub Assembly Warehouse"
 msgstr ""
 
-#: stock/doctype/item/item.py:487
+#: stock/doctype/item/item.py:488
 msgid "Row #{0}: Please set reorder quantity"
 msgstr ""
 
-#: controllers/accounts_controller.py:411
+#: controllers/accounts_controller.py:414
 msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master"
 msgstr ""
 
@@ -61656,29 +62711,29 @@
 msgid "Row #{0}: Qty increased by {1}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:270
-#: assets/doctype/asset_capitalization/asset_capitalization.py:312
+#: assets/doctype/asset_capitalization/asset_capitalization.py:272
+#: assets/doctype/asset_capitalization/asset_capitalization.py:318
 msgid "Row #{0}: Qty must be a positive number"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:301
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:299
 msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}."
 msgstr ""
 
-#: controllers/accounts_controller.py:1082
-#: controllers/accounts_controller.py:3257
+#: controllers/accounts_controller.py:1094
+#: controllers/accounts_controller.py:3219
 msgid "Row #{0}: Quantity for Item {1} cannot be zero."
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1019
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1005
 msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
 msgstr ""
 
-#: utilities/transaction_base.py:113 utilities/transaction_base.py:119
+#: utilities/transaction_base.py:111 utilities/transaction_base.py:117
 msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})"
 msgstr ""
 
-#: controllers/buying_controller.py:470
+#: controllers/buying_controller.py:464
 msgid "Row #{0}: Received Qty must be equal to Accepted + Rejected Qty for Item {1}"
 msgstr ""
 
@@ -61690,11 +62745,11 @@
 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning"
 msgstr ""
 
-#: controllers/buying_controller.py:455
+#: controllers/buying_controller.py:449
 msgid "Row #{0}: Rejected Qty can not be entered in Purchase Return"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:388
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:394
 msgid "Row #{0}: Rejected Qty cannot be set for Scrap Item {1}."
 msgstr ""
 
@@ -61702,11 +62757,11 @@
 msgid "Row #{0}: Rejected Warehouse is mandatory for the rejected Item {1}"
 msgstr ""
 
-#: controllers/buying_controller.py:875
+#: controllers/buying_controller.py:878
 msgid "Row #{0}: Reqd by Date cannot be before Transaction Date"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:383
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:389
 msgid "Row #{0}: Scrap Item Qty cannot be zero"
 msgstr ""
 
@@ -61718,7 +62773,7 @@
 "\t\t\t\t\tthis validation."
 msgstr ""
 
-#: controllers/stock_controller.py:129
+#: controllers/stock_controller.py:137
 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}"
 msgstr ""
 
@@ -61730,19 +62785,19 @@
 msgid "Row #{0}: Serial No {1} is already selected."
 msgstr ""
 
-#: controllers/accounts_controller.py:439
+#: controllers/accounts_controller.py:442
 msgid "Row #{0}: Service End Date cannot be before Invoice Posting Date"
 msgstr ""
 
-#: controllers/accounts_controller.py:435
+#: controllers/accounts_controller.py:436
 msgid "Row #{0}: Service Start Date cannot be greater than Service End Date"
 msgstr ""
 
-#: controllers/accounts_controller.py:431
+#: controllers/accounts_controller.py:430
 msgid "Row #{0}: Service Start and End Date is required for deferred accounting"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:394
+#: selling/doctype/sales_order/sales_order.py:402
 msgid "Row #{0}: Set Supplier for item {1}"
 msgstr ""
 
@@ -61758,7 +62813,7 @@
 msgid "Row #{0}: Status is mandatory"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:397
+#: accounts/doctype/journal_entry/journal_entry.py:391
 msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}"
 msgstr ""
 
@@ -61766,31 +62821,31 @@
 msgid "Row #{0}: Stock cannot be reserved for Item {1} against a disabled Batch {2}."
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:964
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:950
 msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:977
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:963
 msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:991
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:977
 msgid "Row #{0}: Stock is already reserved for the Item {1}."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:666
+#: stock/doctype/delivery_note/delivery_note.py:680
 msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:285
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:283
 msgid "Row #{0}: Stock not available to reserve for Item {1} against Batch {2} in Warehouse {3}."
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1005
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:991
 msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
 msgstr ""
 
-#: controllers/stock_controller.py:142
+#: controllers/stock_controller.py:150
 msgid "Row #{0}: The batch {1} has already expired."
 msgstr ""
 
@@ -61802,19 +62857,19 @@
 msgid "Row #{0}: Timings conflicts with row {1}"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:96
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:95
 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1413
+#: accounts/doctype/sales_invoice/sales_invoice.py:1421
 msgid "Row #{0}: You must select an Asset for Item {1}."
 msgstr ""
 
-#: controllers/buying_controller.py:483 public/js/controllers/buying.js:203
+#: controllers/buying_controller.py:477 public/js/controllers/buying.js:203
 msgid "Row #{0}: {1} can not be negative for item {2}"
 msgstr ""
 
-#: stock/doctype/quality_inspection/quality_inspection.py:228
+#: stock/doctype/quality_inspection/quality_inspection.py:226
 msgid "Row #{0}: {1} is not a valid reading field. Please refer to the field description."
 msgstr ""
 
@@ -61822,7 +62877,7 @@
 msgid "Row #{0}: {1} is required to create the Opening {2} Invoices"
 msgstr ""
 
-#: assets/doctype/asset_category/asset_category.py:88
+#: assets/doctype/asset_category/asset_category.py:90
 msgid "Row #{0}: {1} of {2} should be {3}. Please update the {1} or select a different account."
 msgstr ""
 
@@ -61830,31 +62885,31 @@
 msgid "Row #{0}: {1} serial numbers are required for Item {2}. You have provided {3} serial numbers."
 msgstr ""
 
-#: buying/utils.py:106
+#: buying/utils.py:100
 msgid "Row #{1}: Warehouse is mandatory for stock Item {0}"
 msgstr ""
 
-#: assets/doctype/asset_category/asset_category.py:65
+#: assets/doctype/asset_category/asset_category.py:67
 msgid "Row #{}: Currency of {} - {} doesn't matches company currency."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:277
+#: assets/doctype/asset/asset.py:275
 msgid "Row #{}: Depreciation Posting Date should not be equal to Available for Use Date."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:310
+#: assets/doctype/asset/asset.py:306
 msgid "Row #{}: Finance Book should not be empty since you're using multiple."
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.py:338
+#: accounts/doctype/pos_invoice/pos_invoice.py:340
 msgid "Row #{}: Item Code: {} is not available under warehouse {}."
 msgstr ""
 
-#: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:99
+#: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:101
 msgid "Row #{}: Original Invoice {} of return invoice {} is {}."
 msgstr ""
 
-#: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:87
+#: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:89
 msgid "Row #{}: POS Invoice {} has been {}"
 msgstr ""
 
@@ -61862,7 +62917,7 @@
 msgid "Row #{}: POS Invoice {} is not against customer {}"
 msgstr ""
 
-#: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:84
+#: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:85
 msgid "Row #{}: POS Invoice {} is not submitted yet"
 msgstr ""
 
@@ -61870,23 +62925,23 @@
 msgid "Row #{}: Please assign task to a member."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:302
+#: assets/doctype/asset/asset.py:298
 msgid "Row #{}: Please use a different Finance Book."
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.py:398
+#: accounts/doctype/pos_invoice/pos_invoice.py:400
 msgid "Row #{}: Serial No {} cannot be returned since it was not transacted in original invoice {}"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.py:345
+#: accounts/doctype/pos_invoice/pos_invoice.py:347
 msgid "Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}. Available quantity {}."
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.py:371
+#: accounts/doctype/pos_invoice/pos_invoice.py:373
 msgid "Row #{}: You cannot add positive quantities in a return invoice. Please remove item {} to complete the return."
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:87
+#: stock/doctype/pick_list/pick_list.py:86
 msgid "Row #{}: item {} has been picked already."
 msgstr ""
 
@@ -61898,11 +62953,11 @@
 msgid "Row #{}: {} {} does not exist."
 msgstr ""
 
-#: stock/doctype/item/item.py:1365
+#: stock/doctype/item/item.py:1349
 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:437
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:436
 msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}"
 msgstr ""
 
@@ -61918,15 +62973,15 @@
 msgid "Row {0} : Operation is required against the raw material item {1}"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:117
+#: stock/doctype/pick_list/pick_list.py:116
 msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1144
+#: stock/doctype/stock_entry/stock_entry.py:1151
 msgid "Row {0}# Item {1} cannot be transferred more than {2} against {3} {4}"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1168
+#: stock/doctype/stock_entry/stock_entry.py:1175
 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}"
 msgstr ""
 
@@ -61934,11 +62989,11 @@
 msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:525
+#: accounts/doctype/journal_entry/journal_entry.py:524
 msgid "Row {0}: Account {1} and Party Type {2} have different account types"
 msgstr ""
 
-#: controllers/accounts_controller.py:2621
+#: controllers/accounts_controller.py:2596
 msgid "Row {0}: Account {1} is a Group Account"
 msgstr ""
 
@@ -61946,39 +63001,39 @@
 msgid "Row {0}: Activity Type is mandatory."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:577
+#: accounts/doctype/journal_entry/journal_entry.py:576
 msgid "Row {0}: Advance against Customer must be credit"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:579
+#: accounts/doctype/journal_entry/journal_entry.py:578
 msgid "Row {0}: Advance against Supplier must be debit"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:681
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:676
 msgid "Row {0}: Allocated amount {1} must be less than or equal to invoice outstanding amount {2}"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:673
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:668
 msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:884
+#: stock/doctype/stock_entry/stock_entry.py:883
 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials."
 msgstr ""
 
-#: stock/doctype/material_request/material_request.py:775
+#: stock/doctype/material_request/material_request.py:770
 msgid "Row {0}: Bill of Materials not found for the Item {1}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:823
+#: accounts/doctype/journal_entry/journal_entry.py:830
 msgid "Row {0}: Both Debit and Credit values cannot be zero"
 msgstr ""
 
-#: controllers/buying_controller.py:438 controllers/selling_controller.py:205
+#: controllers/buying_controller.py:432 controllers/selling_controller.py:205
 msgid "Row {0}: Conversion Factor is mandatory"
 msgstr ""
 
-#: controllers/accounts_controller.py:2634
+#: controllers/accounts_controller.py:2609
 msgid "Row {0}: Cost Center {1} does not belong to Company {2}"
 msgstr ""
 
@@ -61986,52 +63041,52 @@
 msgid "Row {0}: Cost center is required for an item {1}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:674
+#: accounts/doctype/journal_entry/journal_entry.py:675
 msgid "Row {0}: Credit entry can not be linked with a {1}"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:434
+#: manufacturing/doctype/bom/bom.py:428
 msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:669
+#: accounts/doctype/journal_entry/journal_entry.py:670
 msgid "Row {0}: Debit entry can not be linked with a {1}"
 msgstr ""
 
-#: controllers/selling_controller.py:703
+#: controllers/selling_controller.py:708
 msgid "Row {0}: Delivery Warehouse ({1}) and Customer Warehouse ({2}) can not be same"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:419
+#: assets/doctype/asset/asset.py:415
 msgid "Row {0}: Depreciation Start Date is required"
 msgstr ""
 
-#: controllers/accounts_controller.py:2301
+#: controllers/accounts_controller.py:2280
 msgid "Row {0}: Due Date in the Payment Terms table cannot be before Posting Date"
 msgstr ""
 
-#: stock/doctype/packing_slip/packing_slip.py:129
+#: stock/doctype/packing_slip/packing_slip.py:127
 msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
 msgstr ""
 
-#: controllers/buying_controller.py:767
+#: controllers/buying_controller.py:770
 msgid "Row {0}: Enter location for the asset item {1}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:913
-#: controllers/taxes_and_totals.py:1116
+#: accounts/doctype/journal_entry/journal_entry.py:921
+#: controllers/taxes_and_totals.py:1123
 msgid "Row {0}: Exchange Rate is mandatory"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:410
+#: assets/doctype/asset/asset.py:406
 msgid "Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:523
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:527
 msgid "Row {0}: Expense Head changed to {1} as no Purchase Receipt is created against Item {2}."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:486
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:484
 msgid "Row {0}: Expense Head changed to {1} because account {2} is not linked to warehouse {3} or it is not the default inventory account"
 msgstr ""
 
@@ -62039,7 +63094,7 @@
 msgid "Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:111
+#: buying/doctype/request_for_quotation/request_for_quotation.py:110
 msgid "Row {0}: For Supplier {1}, Email Address is Required to send an email"
 msgstr ""
 
@@ -62047,16 +63102,16 @@
 msgid "Row {0}: From Time and To Time is mandatory."
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:224
+#: manufacturing/doctype/job_card/job_card.py:220
 #: projects/doctype/timesheet/timesheet.py:179
 msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
 msgstr ""
 
-#: controllers/stock_controller.py:913
+#: controllers/stock_controller.py:937
 msgid "Row {0}: From Warehouse is mandatory for internal transfers"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:219
+#: manufacturing/doctype/job_card/job_card.py:215
 msgid "Row {0}: From time must be less than to time"
 msgstr ""
 
@@ -62064,7 +63119,7 @@
 msgid "Row {0}: Hours value must be greater than zero."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:692
+#: accounts/doctype/journal_entry/journal_entry.py:695
 msgid "Row {0}: Invalid reference {1}"
 msgstr ""
 
@@ -62072,7 +63127,7 @@
 msgid "Row {0}: Item Tax template updated as per validity and rate applied"
 msgstr ""
 
-#: controllers/buying_controller.py:400 controllers/selling_controller.py:484
+#: controllers/buying_controller.py:394 controllers/selling_controller.py:488
 msgid "Row {0}: Item rate has been updated as per valuation rate since its an internal stock transfer"
 msgstr ""
 
@@ -62084,39 +63139,39 @@
 msgid "Row {0}: Item {1} must be a subcontracted item."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:722
+#: stock/doctype/delivery_note/delivery_note.py:737
 msgid "Row {0}: Packed Qty must be equal to {1} Qty."
 msgstr ""
 
-#: stock/doctype/packing_slip/packing_slip.py:148
+#: stock/doctype/packing_slip/packing_slip.py:146
 msgid "Row {0}: Packing Slip is already created for Item {1}."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:714
+#: accounts/doctype/journal_entry/journal_entry.py:721
 msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:516
+#: accounts/doctype/journal_entry/journal_entry.py:515
 msgid "Row {0}: Party Type and Party is required for Receivable / Payable account {1}"
 msgstr ""
 
-#: accounts/doctype/payment_terms_template/payment_terms_template.py:47
+#: accounts/doctype/payment_terms_template/payment_terms_template.py:45
 msgid "Row {0}: Payment Term is mandatory"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:570
+#: accounts/doctype/journal_entry/journal_entry.py:569
 msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:563
+#: accounts/doctype/journal_entry/journal_entry.py:562
 msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
 msgstr ""
 
-#: stock/doctype/packing_slip/packing_slip.py:142
+#: stock/doctype/packing_slip/packing_slip.py:140
 msgid "Row {0}: Please provide a valid Delivery Note Item or Packed Item reference."
 msgstr ""
 
-#: controllers/subcontracting_controller.py:118
+#: controllers/subcontracting_controller.py:123
 msgid "Row {0}: Please select a BOM for Item {1}."
 msgstr ""
 
@@ -62124,7 +63179,7 @@
 msgid "Row {0}: Please select an active BOM for Item {1}."
 msgstr ""
 
-#: controllers/subcontracting_controller.py:115
+#: controllers/subcontracting_controller.py:117
 msgid "Row {0}: Please select an valid BOM for Item {1}."
 msgstr ""
 
@@ -62132,7 +63187,7 @@
 msgid "Row {0}: Please set at Tax Exemption Reason in Sales Taxes and Charges"
 msgstr ""
 
-#: regional/italy/utils.py:338
+#: regional/italy/utils.py:340
 msgid "Row {0}: Please set the Mode of Payment in Payment Schedule"
 msgstr ""
 
@@ -62148,15 +63203,15 @@
 msgid "Row {0}: Purchase Invoice {1} has no stock impact."
 msgstr ""
 
-#: stock/doctype/packing_slip/packing_slip.py:154
+#: stock/doctype/packing_slip/packing_slip.py:152
 msgid "Row {0}: Qty cannot be greater than {1} for the Item {2}."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:362
+#: stock/doctype/stock_entry/stock_entry.py:363
 msgid "Row {0}: Qty in Stock UOM can not be zero."
 msgstr ""
 
-#: stock/doctype/packing_slip/packing_slip.py:125
+#: stock/doctype/packing_slip/packing_slip.py:123
 msgid "Row {0}: Qty must be greater than 0."
 msgstr ""
 
@@ -62164,35 +63219,35 @@
 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})"
 msgstr ""
 
-#: assets/doctype/asset_shift_allocation/asset_shift_allocation.py:97
+#: assets/doctype/asset_shift_allocation/asset_shift_allocation.py:93
 msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1179
+#: stock/doctype/stock_entry/stock_entry.py:1188
 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
 msgstr ""
 
-#: controllers/stock_controller.py:904
+#: controllers/stock_controller.py:928
 msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:405
+#: stock/doctype/stock_entry/stock_entry.py:406
 msgid "Row {0}: The item {1}, quantity must be positive number"
 msgstr ""
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:218
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:217
 msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:443
+#: assets/doctype/asset/asset.py:440
 msgid "Row {0}: Total Number of Depreciations cannot be less than or equal to Number of Depreciations Booked"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:356
+#: stock/doctype/stock_entry/stock_entry.py:357
 msgid "Row {0}: UOM Conversion Factor is mandatory"
 msgstr ""
 
-#: controllers/accounts_controller.py:838
+#: controllers/accounts_controller.py:852
 msgid "Row {0}: user has not applied the rule {1} on the item {2}"
 msgstr ""
 
@@ -62204,11 +63259,11 @@
 msgid "Row {0}: {1} must be greater than 0"
 msgstr ""
 
-#: controllers/accounts_controller.py:555
+#: controllers/accounts_controller.py:564
 msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:728
+#: accounts/doctype/journal_entry/journal_entry.py:735
 msgid "Row {0}: {1} {2} does not match with {3}"
 msgstr ""
 
@@ -62216,15 +63271,15 @@
 msgid "Row {0}: {2} Item {1} does not exist in {2} {3}"
 msgstr ""
 
-#: controllers/accounts_controller.py:2613
+#: controllers/accounts_controller.py:2588
 msgid "Row {0}: {3} Account {1} does not belong to Company {2}"
 msgstr ""
 
-#: utilities/transaction_base.py:217
+#: utilities/transaction_base.py:215
 msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}."
 msgstr ""
 
-#: controllers/buying_controller.py:751
+#: controllers/buying_controller.py:754
 msgid "Row {}: Asset Naming Series is mandatory for the auto creation for item {}"
 msgstr ""
 
@@ -62251,7 +63306,7 @@
 msgid "Rows with Same Account heads will be merged on Ledger"
 msgstr ""
 
-#: controllers/accounts_controller.py:2310
+#: controllers/accounts_controller.py:2290
 msgid "Rows with duplicate due dates in other rows were found: {0}"
 msgstr ""
 
@@ -62259,7 +63314,7 @@
 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually."
 msgstr ""
 
-#: controllers/accounts_controller.py:221
+#: controllers/accounts_controller.py:219
 msgid "Rows: {0} in {1} section are Invalid. Reference Name should point to a valid Payment Entry or Journal Entry."
 msgstr ""
 
@@ -62378,7 +63433,7 @@
 msgid "SLA Paused On"
 msgstr ""
 
-#: public/js/utils.js:1098
+#: public/js/utils.js:1096
 msgid "SLA is on hold since {0}"
 msgstr ""
 
@@ -62461,7 +63516,7 @@
 msgid "SWIFT number"
 msgstr ""
 
-#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:60
+#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:58
 msgid "Safety Stock"
 msgstr ""
 
@@ -62514,8 +63569,8 @@
 #: accounts/doctype/shipping_rule/shipping_rule_dashboard.py:10
 #: accounts/doctype/tax_category/tax_category_dashboard.py:9
 #: projects/doctype/project/project_dashboard.py:15
-#: regional/report/vat_audit_report/vat_audit_report.py:184
-#: setup/doctype/company/company.py:328 setup/doctype/company/company.py:491
+#: regional/report/vat_audit_report/vat_audit_report.py:180
+#: setup/doctype/company/company.py:320 setup/doctype/company/company.py:483
 #: setup/doctype/company/company_dashboard.py:9
 #: setup/doctype/sales_person/sales_person_dashboard.py:12
 #: setup/setup_wizard/operations/install_fixtures.py:250
@@ -62553,7 +63608,7 @@
 msgid "Sales"
 msgstr ""
 
-#: setup/doctype/company/company.py:491
+#: setup/doctype/company/company.py:483
 msgid "Sales Account"
 msgstr ""
 
@@ -62596,8 +63651,8 @@
 #: accounts/doctype/sales_invoice/sales_invoice.json
 #: accounts/print_format/sales_auditing_voucher/sales_auditing_voucher.html:5
 #: accounts/report/gross_profit/gross_profit.js:30
-#: accounts/report/gross_profit/gross_profit.py:199
-#: accounts/report/gross_profit/gross_profit.py:206
+#: accounts/report/gross_profit/gross_profit.py:197
+#: accounts/report/gross_profit/gross_profit.py:204
 #: selling/doctype/quotation/quotation_list.js:19
 #: selling/doctype/sales_order/sales_order.js:633
 #: selling/doctype/sales_order/sales_order_list.js:66
@@ -62752,11 +63807,11 @@
 msgid "Sales Invoice Trends"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:740
+#: stock/doctype/delivery_note/delivery_note.py:755
 msgid "Sales Invoice {0} has already been submitted"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:475
+#: selling/doctype/sales_order/sales_order.py:481
 msgid "Sales Invoice {0} must be deleted before cancelling this Sales Order"
 msgstr ""
 
@@ -62827,9 +63882,9 @@
 #. Name of a DocType
 #. Title of an Onboarding Step
 #: accounts/doctype/sales_invoice/sales_invoice.js:263
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:279
-#: accounts/report/sales_register/sales_register.py:236
-#: controllers/selling_controller.py:422
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:284
+#: accounts/report/sales_register/sales_register.py:237
+#: controllers/selling_controller.py:425
 #: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:65
 #: maintenance/doctype/maintenance_visit/maintenance_visit.js:122
 #: manufacturing/doctype/blanket_order/blanket_order.js:24
@@ -63090,11 +64145,11 @@
 msgid "Sales Order required for Item {0}"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:261
+#: selling/doctype/sales_order/sales_order.py:263
 msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1149
+#: accounts/doctype/sales_invoice/sales_invoice.py:1153
 msgid "Sales Order {0} is not submitted"
 msgstr ""
 
@@ -63102,7 +64157,7 @@
 msgid "Sales Order {0} is not valid"
 msgstr ""
 
-#: controllers/selling_controller.py:403
+#: controllers/selling_controller.py:406
 #: manufacturing/doctype/work_order/work_order.py:223
 msgid "Sales Order {0} is {1}"
 msgstr ""
@@ -63136,9 +64191,9 @@
 
 #. Name of a DocType
 #: accounts/report/accounts_receivable/accounts_receivable.js:136
-#: accounts/report/accounts_receivable/accounts_receivable.py:1114
+#: accounts/report/accounts_receivable/accounts_receivable.py:1104
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:120
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:197
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:195
 #: accounts/report/customer_ledger_summary/customer_ledger_summary.js:73
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:8
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:48
@@ -63287,12 +64342,12 @@
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:155
 #: accounts/report/accounts_receivable/accounts_receivable.html:137
 #: accounts/report/accounts_receivable/accounts_receivable.js:142
-#: accounts/report/accounts_receivable/accounts_receivable.py:1111
+#: accounts/report/accounts_receivable/accounts_receivable.py:1101
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:126
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:194
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:192
 #: accounts/report/customer_ledger_summary/customer_ledger_summary.js:79
 #: accounts/report/gross_profit/gross_profit.js:50
-#: accounts/report/gross_profit/gross_profit.py:307
+#: accounts/report/gross_profit/gross_profit.py:305
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:8
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:69
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:8
@@ -63398,7 +64453,7 @@
 msgid "Sales Register"
 msgstr ""
 
-#: accounts/report/gross_profit/gross_profit.py:777
+#: accounts/report/gross_profit/gross_profit.py:775
 #: stock/doctype/delivery_note/delivery_note.js:200
 msgid "Sales Return"
 msgstr ""
@@ -63673,15 +64728,15 @@
 msgid "Same Item"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:404
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:407
 msgid "Same item and warehouse combination already entered."
 msgstr ""
 
-#: buying/utils.py:59
+#: buying/utils.py:58
 msgid "Same item cannot be entered multiple times."
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:80
+#: buying/doctype/request_for_quotation/request_for_quotation.py:79
 msgid "Same supplier has been entered multiple times"
 msgstr ""
 
@@ -63704,7 +64759,7 @@
 msgstr ""
 
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:93
-#: public/js/controllers/transaction.js:2174
+#: public/js/controllers/transaction.js:2175
 msgid "Sample Size"
 msgstr ""
 
@@ -63714,7 +64769,7 @@
 msgid "Sample Size"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2860
+#: stock/doctype/stock_entry/stock_entry.py:2892
 msgid "Sample quantity {0} cannot be more than received quantity {1}"
 msgstr ""
 
@@ -63788,7 +64843,7 @@
 msgstr ""
 
 #: accounts/doctype/bank_statement_import/bank_statement_import.js:118
-#: accounts/doctype/journal_entry/journal_entry.js:619
+#: accounts/doctype/journal_entry/journal_entry.js:622
 #: accounts/doctype/ledger_merge/ledger_merge.js:75
 #: accounts/doctype/purchase_invoice/purchase_invoice.js:289
 #: accounts/doctype/purchase_invoice/purchase_invoice.js:325
@@ -63800,7 +64855,7 @@
 msgid "Save as Draft"
 msgstr ""
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.py:373
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.py:364
 msgid "Saving {0}"
 msgstr ""
 
@@ -63809,6 +64864,11 @@
 msgid "Savings"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Sazhen"
+msgstr ""
+
 #: public/js/utils/barcode_scanner.js:215
 msgid "Scan Barcode"
 msgstr ""
@@ -63992,26 +65052,26 @@
 msgid "Scheduled Time Logs"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.py:85
+#: accounts/doctype/bank_statement_import/bank_statement_import.py:83
 #: accounts/doctype/ledger_merge/ledger_merge.py:39
 #: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:232
-#: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:549
+#: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:547
 msgid "Scheduler Inactive"
 msgstr ""
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py:183
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py:181
 msgid "Scheduler is Inactive. Can't trigger job now."
 msgstr ""
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py:235
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py:233
 msgid "Scheduler is Inactive. Can't trigger jobs now."
 msgstr ""
 
-#: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:549
+#: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:547
 msgid "Scheduler is inactive. Cannot enqueue job."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.py:85
+#: accounts/doctype/bank_statement_import/bank_statement_import.py:83
 #: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:232
 msgid "Scheduler is inactive. Cannot import data."
 msgstr ""
@@ -64193,6 +65253,11 @@
 msgid "Search by item code, serial number or barcode"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Second"
+msgstr ""
+
 #. Label of a Time field in DocType 'Project'
 #: projects/doctype/project/project.json
 msgctxt "Project"
@@ -64211,7 +65276,7 @@
 msgid "Secondary Role"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:172
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:170
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:117
 msgid "Section Code"
 msgstr ""
@@ -64248,7 +65313,7 @@
 msgid "Select Accounting Dimension."
 msgstr ""
 
-#: public/js/utils.js:487
+#: public/js/utils.js:485
 msgid "Select Alternate Item"
 msgstr ""
 
@@ -64272,7 +65337,7 @@
 msgid "Select BOM, Qty and For Warehouse"
 msgstr ""
 
-#: public/js/utils/sales_common.js:361
+#: public/js/utils/sales_common.js:360
 #: selling/page/point_of_sale/pos_item_details.js:212
 #: stock/doctype/pick_list/pick_list.js:352
 msgid "Select Batch No"
@@ -64351,7 +65416,7 @@
 msgid "Select Items based on Delivery Date"
 msgstr ""
 
-#: public/js/controllers/transaction.js:2202
+#: public/js/controllers/transaction.js:2203
 msgid "Select Items for Quality Inspection"
 msgstr ""
 
@@ -64383,13 +65448,13 @@
 msgid "Select Quantity"
 msgstr ""
 
-#: public/js/utils/sales_common.js:361
+#: public/js/utils/sales_common.js:360
 #: selling/page/point_of_sale/pos_item_details.js:212
 #: stock/doctype/pick_list/pick_list.js:352
 msgid "Select Serial No"
 msgstr ""
 
-#: public/js/utils/sales_common.js:364 stock/doctype/pick_list/pick_list.js:355
+#: public/js/utils/sales_common.js:363 stock/doctype/pick_list/pick_list.js:355
 msgid "Select Serial and Batch"
 msgstr ""
 
@@ -64454,7 +65519,7 @@
 msgid "Select a Customer"
 msgstr ""
 
-#: support/doctype/service_level_agreement/service_level_agreement.py:111
+#: support/doctype/service_level_agreement/service_level_agreement.py:115
 msgid "Select a Default Priority."
 msgstr ""
 
@@ -64501,7 +65566,7 @@
 msgid "Select company name first."
 msgstr ""
 
-#: controllers/accounts_controller.py:2486
+#: controllers/accounts_controller.py:2463
 msgid "Select finance book for the item {0} at row {1}"
 msgstr ""
 
@@ -64573,7 +65638,7 @@
 msgid "Selected POS Opening Entry should be open."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2161
+#: accounts/doctype/sales_invoice/sales_invoice.py:2168
 msgid "Selected Price List should have buying and selling fields checked."
 msgstr ""
 
@@ -64667,7 +65732,7 @@
 msgid "Selling"
 msgstr ""
 
-#: accounts/report/gross_profit/gross_profit.py:273
+#: accounts/report/gross_profit/gross_profit.py:271
 msgid "Selling Amount"
 msgstr ""
 
@@ -64860,7 +65925,7 @@
 msgid "Serial / Batch Bundle"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.py:362
+#: accounts/doctype/pos_invoice/pos_invoice.py:364
 msgid "Serial / Batch Bundle Missing"
 msgstr ""
 
@@ -64876,13 +65941,13 @@
 
 #. Name of a DocType
 #: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:74
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:116
-#: public/js/controllers/transaction.js:2187
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:114
+#: public/js/controllers/transaction.js:2188
 #: public/js/utils/serial_no_batch_selector.js:355
 #: stock/doctype/serial_no/serial_no.json
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:160
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:158
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:64
-#: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:150
+#: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:149
 #: stock/report/serial_no_ledger/serial_no_ledger.js:38
 #: stock/report/serial_no_ledger/serial_no_ledger.py:57
 #: stock/report/stock_ledger/stock_ledger.py:319
@@ -65089,11 +66154,11 @@
 msgid "Serial No and Batch for Finished Good"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:572
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:604
 msgid "Serial No is mandatory"
 msgstr ""
 
-#: selling/doctype/installation_note/installation_note.py:76
+#: selling/doctype/installation_note/installation_note.py:77
 msgid "Serial No is mandatory for Item {0}"
 msgstr ""
 
@@ -65105,20 +66170,20 @@
 msgid "Serial No {0} already scanned"
 msgstr ""
 
-#: selling/doctype/installation_note/installation_note.py:93
+#: selling/doctype/installation_note/installation_note.py:94
 msgid "Serial No {0} does not belong to Delivery Note {1}"
 msgstr ""
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:322
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:321
 msgid "Serial No {0} does not belong to Item {1}"
 msgstr ""
 
 #: maintenance/doctype/maintenance_visit/maintenance_visit.py:52
-#: selling/doctype/installation_note/installation_note.py:83
+#: selling/doctype/installation_note/installation_note.py:84
 msgid "Serial No {0} does not exist"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2131
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2157
 msgid "Serial No {0} does not exists"
 msgstr ""
 
@@ -65126,15 +66191,15 @@
 msgid "Serial No {0} is already added"
 msgstr ""
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:341
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:338
 msgid "Serial No {0} is under maintenance contract upto {1}"
 msgstr ""
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:332
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:331
 msgid "Serial No {0} is under warranty upto {1}"
 msgstr ""
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:318
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:317
 msgid "Serial No {0} not found"
 msgstr ""
 
@@ -65164,11 +66229,11 @@
 msgid "Serial Nos and Batches"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1081
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1112
 msgid "Serial Nos are created successfully"
 msgstr ""
 
-#: stock/stock_ledger.py:1979
+#: stock/stock_ledger.py:1945
 msgid "Serial Nos are reserved in Stock Reservation Entries, you need to unreserve them before proceeding."
 msgstr ""
 
@@ -65289,15 +66354,15 @@
 msgid "Serial and Batch Bundle"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1260
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1288
 msgid "Serial and Batch Bundle created"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1309
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1337
 msgid "Serial and Batch Bundle updated"
 msgstr ""
 
-#: controllers/stock_controller.py:82
+#: controllers/stock_controller.py:90
 msgid "Serial and Batch Bundle {0} is already used in {1} {2}."
 msgstr ""
 
@@ -65352,11 +66417,11 @@
 msgid "Serial and Batch Summary"
 msgstr ""
 
-#: stock/utils.py:422
+#: stock/utils.py:408
 msgid "Serial number {0} entered more than once"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:611
+#: accounts/doctype/journal_entry/journal_entry.js:614
 msgid "Series"
 msgstr ""
 
@@ -65660,7 +66725,7 @@
 msgid "Series for Asset Depreciation Entry (Journal Entry)"
 msgstr ""
 
-#: buying/doctype/supplier/supplier.py:139
+#: buying/doctype/supplier/supplier.py:136
 msgid "Series is mandatory"
 msgstr ""
 
@@ -65753,11 +66818,11 @@
 msgid "Service Item UOM"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_bom/subcontracting_bom.py:66
+#: subcontracting/doctype/subcontracting_bom/subcontracting_bom.py:64
 msgid "Service Item {0} is disabled."
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_bom/subcontracting_bom.py:69
+#: subcontracting/doctype/subcontracting_bom/subcontracting_bom.py:67
 msgid "Service Item {0} must be a non-stock item."
 msgstr ""
 
@@ -65806,11 +66871,11 @@
 msgid "Service Level Agreement Status"
 msgstr ""
 
-#: support/doctype/service_level_agreement/service_level_agreement.py:172
+#: support/doctype/service_level_agreement/service_level_agreement.py:176
 msgid "Service Level Agreement for {0} {1} already exists."
 msgstr ""
 
-#: support/doctype/service_level_agreement/service_level_agreement.py:764
+#: support/doctype/service_level_agreement/service_level_agreement.py:761
 msgid "Service Level Agreement has been changed to {0}."
 msgstr ""
 
@@ -65895,11 +66960,11 @@
 msgid "Service Stop Date"
 msgstr ""
 
-#: accounts/deferred_revenue.py:48 public/js/controllers/transaction.js:1298
+#: accounts/deferred_revenue.py:44 public/js/controllers/transaction.js:1299
 msgid "Service Stop Date cannot be after Service End Date"
 msgstr ""
 
-#: accounts/deferred_revenue.py:45 public/js/controllers/transaction.js:1295
+#: accounts/deferred_revenue.py:41 public/js/controllers/transaction.js:1296
 msgid "Service Stop Date cannot be before Service Start Date"
 msgstr ""
 
@@ -65914,6 +66979,11 @@
 msgid "Services"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Set"
+msgstr ""
+
 #. Label of a Link field in DocType 'Purchase Invoice'
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
@@ -65993,7 +67063,7 @@
 msgid "Set Operating Cost Based On BOM Quantity"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:264
+#: buying/doctype/request_for_quotation/request_for_quotation.py:263
 msgid "Set Password"
 msgstr ""
 
@@ -66034,7 +67104,7 @@
 msgstr ""
 
 #: support/doctype/service_level_agreement/service_level_agreement.py:82
-#: support/doctype/service_level_agreement/service_level_agreement.py:88
+#: support/doctype/service_level_agreement/service_level_agreement.py:90
 msgid "Set Response Time for Priority {0} in row {1}."
 msgstr ""
 
@@ -66110,7 +67180,7 @@
 msgid "Set as Completed"
 msgstr ""
 
-#: public/js/utils/sales_common.js:462
+#: public/js/utils/sales_common.js:459
 #: selling/doctype/quotation/quotation.js:129
 msgid "Set as Lost"
 msgstr ""
@@ -66120,11 +67190,11 @@
 msgid "Set as Open"
 msgstr ""
 
-#: setup/doctype/company/company.py:418
+#: setup/doctype/company/company.py:410
 msgid "Set default inventory account for perpetual inventory"
 msgstr ""
 
-#: setup/doctype/company/company.py:428
+#: setup/doctype/company/company.py:420
 msgid "Set default {0} account for non stock items"
 msgstr ""
 
@@ -66163,7 +67233,7 @@
 msgid "Set the status manually."
 msgstr ""
 
-#: regional/italy/setup.py:230
+#: regional/italy/setup.py:231
 msgid "Set this if the customer is a Public Administration company."
 msgstr ""
 
@@ -66174,15 +67244,15 @@
 msgid "Set up your Warehouse"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:674
+#: assets/doctype/asset/asset.py:670
 msgid "Set {0} in asset category {1} for company {2}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:957
+#: assets/doctype/asset/asset.py:945
 msgid "Set {0} in asset category {1} or company {2}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:953
+#: assets/doctype/asset/asset.py:942
 msgid "Set {0} in company {1}"
 msgstr ""
 
@@ -66262,8 +67332,8 @@
 msgid "Setting up company"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:956
-#: manufacturing/doctype/work_order/work_order.py:992
+#: manufacturing/doctype/bom/bom.py:951
+#: manufacturing/doctype/work_order/work_order.py:989
 msgid "Setting {} is required"
 msgstr ""
 
@@ -66511,7 +67581,7 @@
 msgid "Shipment details"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:907
+#: stock/doctype/delivery_note/delivery_note.py:922
 msgid "Shipments"
 msgstr ""
 
@@ -66534,20 +67604,20 @@
 msgstr ""
 
 #. Label of a Link field in DocType 'Delivery Note'
-#. Label of a Small Text field in DocType 'Delivery Note'
+#. Label of a Text Editor field in DocType 'Delivery Note'
 #. Label of a Section Break field in DocType 'Delivery Note'
 #: stock/doctype/delivery_note/delivery_note.json
 msgctxt "Delivery Note"
 msgid "Shipping Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'POS Invoice'
+#. Label of a Text Editor field in DocType 'POS Invoice'
 #: accounts/doctype/pos_invoice/pos_invoice.json
 msgctxt "POS Invoice"
 msgid "Shipping Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Purchase Invoice'
+#. Label of a Text Editor field in DocType 'Purchase Invoice'
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
 msgid "Shipping Address"
@@ -66560,35 +67630,35 @@
 msgid "Shipping Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Purchase Receipt'
+#. Label of a Text Editor field in DocType 'Purchase Receipt'
 #: stock/doctype/purchase_receipt/purchase_receipt.json
 msgctxt "Purchase Receipt"
 msgid "Shipping Address"
 msgstr ""
 
 #. Label of a Link field in DocType 'Quotation'
-#. Label of a Small Text field in DocType 'Quotation'
+#. Label of a Text Editor field in DocType 'Quotation'
 #. Label of a Section Break field in DocType 'Quotation'
 #: selling/doctype/quotation/quotation.json
 msgctxt "Quotation"
 msgid "Shipping Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Sales Invoice'
+#. Label of a Text Editor field in DocType 'Sales Invoice'
 #. Label of a Section Break field in DocType 'Sales Invoice'
 #: accounts/doctype/sales_invoice/sales_invoice.json
 msgctxt "Sales Invoice"
 msgid "Shipping Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Sales Order'
+#. Label of a Text Editor field in DocType 'Sales Order'
 #. Label of a Section Break field in DocType 'Sales Order'
 #: selling/doctype/sales_order/sales_order.json
 msgctxt "Sales Order"
 msgid "Shipping Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Subcontracting Receipt'
+#. Label of a Text Editor field in DocType 'Subcontracting Receipt'
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 msgctxt "Subcontracting Receipt"
 msgid "Shipping Address"
@@ -66601,19 +67671,19 @@
 msgid "Shipping Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Purchase Order'
+#. Label of a Text Editor field in DocType 'Purchase Order'
 #: buying/doctype/purchase_order/purchase_order.json
 msgctxt "Purchase Order"
 msgid "Shipping Address Details"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Subcontracting Order'
+#. Label of a Text Editor field in DocType 'Subcontracting Order'
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
 msgctxt "Subcontracting Order"
 msgid "Shipping Address Details"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Supplier Quotation'
+#. Label of a Text Editor field in DocType 'Supplier Quotation'
 #: buying/doctype/supplier_quotation/supplier_quotation.json
 msgctxt "Supplier Quotation"
 msgid "Shipping Address Details"
@@ -66643,7 +67713,7 @@
 msgid "Shipping Address Template"
 msgstr ""
 
-#: accounts/doctype/shipping_rule/shipping_rule.py:130
+#: accounts/doctype/shipping_rule/shipping_rule.py:129
 msgid "Shipping Address does not have country, which is required for this Shipping Rule"
 msgstr ""
 
@@ -66784,15 +67854,15 @@
 msgid "Shipping Zipcode"
 msgstr ""
 
-#: accounts/doctype/shipping_rule/shipping_rule.py:134
+#: accounts/doctype/shipping_rule/shipping_rule.py:133
 msgid "Shipping rule not applicable for country {0} in Shipping Address"
 msgstr ""
 
-#: accounts/doctype/shipping_rule/shipping_rule.py:151
+#: accounts/doctype/shipping_rule/shipping_rule.py:152
 msgid "Shipping rule only applicable for Buying"
 msgstr ""
 
-#: accounts/doctype/shipping_rule/shipping_rule.py:146
+#: accounts/doctype/shipping_rule/shipping_rule.py:147
 msgid "Shipping rule only applicable for Selling"
 msgstr ""
 
@@ -67033,7 +68103,7 @@
 msgid "Show only the Immediate Upcoming Term"
 msgstr ""
 
-#: stock/utils.py:583
+#: stock/utils.py:568
 msgid "Show pending entries"
 msgstr ""
 
@@ -67138,7 +68208,7 @@
 msgid "Simultaneous"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:506
+#: stock/doctype/stock_entry/stock_entry.py:507
 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 ""
 
@@ -67193,7 +68263,7 @@
 msgid "Skipped"
 msgstr ""
 
-#: accounts/doctype/tax_withholding_category/tax_withholding_category.py:125
+#: accounts/doctype/tax_withholding_category/tax_withholding_category.py:123
 msgid "Skipping Tax Withholding Category {0} as there is no associated account set for Company {1} in it."
 msgstr ""
 
@@ -67207,6 +68277,16 @@
 msgid "Skype ID"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Slug"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Slug/Cubic Foot"
+msgstr ""
+
 #: setup/setup_wizard/operations/install_fixtures.py:223
 msgid "Small"
 msgstr ""
@@ -67238,15 +68318,15 @@
 msgid "Something went wrong please try again"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:746
+#: accounts/doctype/pricing_rule/utils.py:733
 msgid "Sorry, this coupon code is no longer valid"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:744
+#: accounts/doctype/pricing_rule/utils.py:731
 msgid "Sorry, this coupon code's validity has expired"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:741
+#: accounts/doctype/pricing_rule/utils.py:728
 msgid "Sorry, this coupon code's validity has not started"
 msgstr ""
 
@@ -67361,7 +68441,7 @@
 #: manufacturing/doctype/bom/bom.js:326
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:126
 #: stock/dashboard/item_dashboard.js:223
-#: stock/doctype/stock_entry/stock_entry.js:627
+#: stock/doctype/stock_entry/stock_entry.js:641
 msgid "Source Warehouse"
 msgstr ""
 
@@ -67426,17 +68506,17 @@
 msgstr ""
 
 #. Label of a Link field in DocType 'Stock Entry'
-#. Label of a Small Text field in DocType 'Stock Entry'
+#. Label of a Text Editor field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
 msgid "Source Warehouse Address"
 msgstr ""
 
-#: assets/doctype/asset_movement/asset_movement.py:84
+#: assets/doctype/asset_movement/asset_movement.py:88
 msgid "Source and Target Location cannot be same"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:595
+#: stock/doctype/stock_entry/stock_entry.py:596
 msgid "Source and target warehouse cannot be same for row {0}"
 msgstr ""
 
@@ -67449,8 +68529,8 @@
 msgid "Source of Funds (Liabilities)"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:572
-#: stock/doctype/stock_entry/stock_entry.py:589
+#: stock/doctype/stock_entry/stock_entry.py:573
+#: stock/doctype/stock_entry/stock_entry.py:590
 msgid "Source warehouse is mandatory for row {0}"
 msgstr ""
 
@@ -67532,14 +68612,49 @@
 msgid "Split Qty"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1054
+#: assets/doctype/asset/asset.py:1042
 msgid "Split qty cannot be grater than or equal to asset qty"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1846
+#: accounts/doctype/payment_entry/payment_entry.py:1867
 msgid "Splitting {0} {1} into {2} rows as per Payment Terms"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Square Centimeter"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Square Foot"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Square Inch"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Square Kilometer"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Square Meter"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Square Mile"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Square Yard"
+msgstr ""
+
 #: accounts/print_format/sales_invoice_return/sales_invoice_return.html:52
 #: templates/print_formats/includes/items.html:8
 msgid "Sr"
@@ -67567,8 +68682,8 @@
 msgid "Stale Days should start from 1."
 msgstr ""
 
-#: setup/setup_wizard/operations/defaults_setup.py:71
-#: setup/setup_wizard/operations/install_fixtures.py:433
+#: setup/setup_wizard/operations/defaults_setup.py:69
+#: setup/setup_wizard/operations/install_fixtures.py:425
 msgid "Standard Buying"
 msgstr ""
 
@@ -67576,13 +68691,13 @@
 msgid "Standard Description"
 msgstr ""
 
-#: regional/report/uae_vat_201/uae_vat_201.py:119
+#: regional/report/uae_vat_201/uae_vat_201.py:115
 msgid "Standard Rated Expenses"
 msgstr ""
 
-#: setup/setup_wizard/operations/defaults_setup.py:71
-#: setup/setup_wizard/operations/install_fixtures.py:441
-#: stock/doctype/item/item.py:245
+#: setup/setup_wizard/operations/defaults_setup.py:69
+#: setup/setup_wizard/operations/install_fixtures.py:433
+#: stock/doctype/item/item.py:244
 msgid "Standard Selling"
 msgstr ""
 
@@ -67604,8 +68719,8 @@
 msgid "Standard Terms and Conditions that can be added to Sales and Purchases. Examples: Validity of the offer, Payment Terms, Safety and Usage, etc."
 msgstr ""
 
-#: regional/report/uae_vat_201/uae_vat_201.py:100
-#: regional/report/uae_vat_201/uae_vat_201.py:106
+#: regional/report/uae_vat_201/uae_vat_201.py:96
+#: regional/report/uae_vat_201/uae_vat_201.py:102
 msgid "Standard rated supplies in {0}"
 msgstr ""
 
@@ -67772,7 +68887,7 @@
 msgid "Start Time"
 msgstr ""
 
-#: support/doctype/service_level_agreement/service_level_agreement.py:125
+#: support/doctype/service_level_agreement/service_level_agreement.py:129
 msgid "Start Time can't be greater than or equal to End Time for {0}."
 msgstr ""
 
@@ -67800,7 +68915,7 @@
 msgid "Start date of current invoice's period"
 msgstr ""
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:236
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:235
 msgid "Start date should be less than end date for Item {0}"
 msgstr ""
 
@@ -67814,7 +68929,7 @@
 msgid "Started Time"
 msgstr ""
 
-#: utilities/bulk_transaction.py:22
+#: utilities/bulk_transaction.py:21
 msgid "Started a background job to create {1} {0}"
 msgstr ""
 
@@ -67865,7 +68980,7 @@
 
 #: accounts/doctype/bank_statement_import/bank_statement_import.js:491
 #: assets/report/fixed_asset_register/fixed_asset_register.js:16
-#: assets/report/fixed_asset_register/fixed_asset_register.py:424
+#: assets/report/fixed_asset_register/fixed_asset_register.py:414
 #: buying/doctype/purchase_order/purchase_order.js:317
 #: buying/doctype/purchase_order/purchase_order.js:323
 #: buying/doctype/purchase_order/purchase_order.js:329
@@ -67874,7 +68989,7 @@
 #: buying/doctype/purchase_order/purchase_order.js:344
 #: buying/report/procurement_tracker/procurement_tracker.py:74
 #: buying/report/purchase_order_analysis/purchase_order_analysis.js:52
-#: buying/report/purchase_order_analysis/purchase_order_analysis.py:173
+#: buying/report/purchase_order_analysis/purchase_order_analysis.py:169
 #: buying/report/subcontract_order_summary/subcontract_order_summary.py:134
 #: crm/report/lead_details/lead_details.js:30
 #: crm/report/lead_details/lead_details.py:25
@@ -67891,7 +69006,7 @@
 #: manufacturing/doctype/workstation/workstation_job_card.html:51
 #: manufacturing/report/job_card_summary/job_card_summary.js:50
 #: manufacturing/report/job_card_summary/job_card_summary.py:139
-#: manufacturing/report/process_loss_report/process_loss_report.py:81
+#: manufacturing/report/process_loss_report/process_loss_report.py:80
 #: manufacturing/report/production_analytics/production_analytics.py:19
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:21
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:80
@@ -68414,7 +69529,7 @@
 msgid "Status Illustration"
 msgstr ""
 
-#: projects/doctype/project/project.py:719
+#: projects/doctype/project/project.py:717
 msgid "Status must be Cancelled or Completed"
 msgstr ""
 
@@ -68422,7 +69537,7 @@
 msgid "Status must be one of {0}"
 msgstr ""
 
-#: stock/doctype/quality_inspection/quality_inspection.py:187
+#: stock/doctype/quality_inspection/quality_inspection.py:183
 msgid "Status set to rejected as there are one or more rejected readings."
 msgstr ""
 
@@ -68462,7 +69577,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:50
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:73
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1239
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1244
 #: accounts/report/account_balance/account_balance.js:58
 msgid "Stock Adjustment"
 msgstr ""
@@ -68622,7 +69737,7 @@
 msgid "Stock Entry Type"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:1140
+#: stock/doctype/pick_list/pick_list.py:1127
 msgid "Stock Entry has been already created against this Pick List"
 msgstr ""
 
@@ -68630,7 +69745,7 @@
 msgid "Stock Entry {0} created"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:1167
+#: accounts/doctype/journal_entry/journal_entry.py:1169
 msgid "Stock Entry {0} is not submitted"
 msgstr ""
 
@@ -68679,14 +69794,14 @@
 
 #. Name of a DocType
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
-#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:114
+#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:113
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:115
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:28
 msgid "Stock Ledger Entry"
 msgstr ""
 
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:102
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:108
+#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:98
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:106
 msgid "Stock Ledger ID"
 msgstr ""
 
@@ -68769,8 +69884,8 @@
 msgid "Stock Projected Qty"
 msgstr ""
 
-#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:254
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:306
+#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:258
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:311
 #: stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:34
 msgid "Stock Qty"
 msgstr ""
@@ -68829,7 +69944,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: stock/doctype/item/item.py:583
+#: stock/doctype/item/item.py:585
 #: stock/doctype/stock_reconciliation/stock_reconciliation.json
 msgid "Stock Reconciliation"
 msgstr ""
@@ -68849,7 +69964,7 @@
 msgid "Stock Reconciliation Item"
 msgstr ""
 
-#: stock/doctype/item/item.py:583
+#: stock/doctype/item/item.py:585
 msgid "Stock Reconciliations"
 msgstr ""
 
@@ -68870,13 +69985,13 @@
 #: stock/doctype/pick_list/pick_list.js:128
 #: stock/doctype/pick_list/pick_list.js:143
 #: stock/doctype/pick_list/pick_list.js:148
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:521
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:967
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:530
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:953
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:966
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:980
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:994
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1008
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1022
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1039
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1025
 msgid "Stock Reservation"
 msgstr ""
 
@@ -68886,11 +70001,11 @@
 msgid "Stock Reservation"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1146
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1134
 msgid "Stock Reservation Entries Cancelled"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1098
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1086
 msgid "Stock Reservation Entries Created"
 msgstr ""
 
@@ -68902,19 +70017,19 @@
 msgid "Stock Reservation Entry"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:429
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:425
 msgid "Stock Reservation Entry cannot be updated as it has been delivered."
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:423
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:419
 msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:675
+#: stock/doctype/delivery_note/delivery_note.py:690
 msgid "Stock Reservation Warehouse Mismatch"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:514
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:508
 msgid "Stock Reservation can only be created against {0}."
 msgstr ""
 
@@ -68930,7 +70045,7 @@
 msgid "Stock Reserved Qty (in Stock UOM)"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1507
+#: stock/doctype/stock_entry/stock_entry.py:1524
 msgid "Stock Return"
 msgstr ""
 
@@ -68976,13 +70091,13 @@
 msgid "Stock Transactions Settings"
 msgstr ""
 
-#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:256
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:308
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:215
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:232
+#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:260
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:313
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:213
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:228
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.py:35
 #: stock/report/reserved_stock/reserved_stock.py:110
-#: stock/report/stock_balance/stock_balance.py:406
+#: stock/report/stock_balance/stock_balance.py:405
 #: stock/report/stock_ledger/stock_ledger.py:190
 msgid "Stock UOM"
 msgstr ""
@@ -69242,9 +70357,9 @@
 msgid "Stock Validations"
 msgstr ""
 
-#: stock/dashboard_chart_source/warehouse_wise_stock_value/warehouse_wise_stock_value.py:52
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:138
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:124
+#: stock/dashboard_chart_source/warehouse_wise_stock_value/warehouse_wise_stock_value.py:50
+#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:134
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:122
 msgid "Stock Value"
 msgstr ""
 
@@ -69269,19 +70384,19 @@
 msgid "Stock cannot be reserved in group warehouse {0}."
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:910
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:898
 msgid "Stock cannot be reserved in the group warehouse {0}."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:673
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:678
 msgid "Stock cannot be updated against Purchase Receipt {0}"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1032
+#: accounts/doctype/sales_invoice/sales_invoice.py:1036
 msgid "Stock cannot be updated against the following Delivery Notes: {0}"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1055
+#: accounts/doctype/sales_invoice/sales_invoice.py:1059
 msgid "Stock cannot be updated because the invoice contains a drop shipping item. Please disable 'Update Stock' or remove the drop shipping item."
 msgstr ""
 
@@ -69293,7 +70408,7 @@
 msgid "Stock quantity not enough for Item Code: {0} under warehouse {1}. Available quantity {2} {3}."
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:252
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:250
 msgid "Stock transactions before {0} are frozen"
 msgstr ""
 
@@ -69311,10 +70426,15 @@
 msgid "Stock will be reserved on submission of <b>Purchase Receipt</b> created against Material Receipt for Sales Order."
 msgstr ""
 
-#: stock/utils.py:574
+#: stock/utils.py:559
 msgid "Stock/Accounts can not be frozen as processing of backdated entries is going on. Please try again later."
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Stone"
+msgstr ""
+
 #: manufacturing/doctype/work_order/work_order.js:602
 #: stock/doctype/material_request/material_request.js:109
 msgid "Stop"
@@ -69392,14 +70512,14 @@
 msgid "Stopped"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:645
+#: manufacturing/doctype/work_order/work_order.py:654
 msgid "Stopped Work Order cannot be cancelled, Unstop it first to cancel"
 msgstr ""
 
-#: setup/doctype/company/company.py:259
-#: setup/setup_wizard/operations/defaults_setup.py:34
-#: setup/setup_wizard/operations/install_fixtures.py:481
-#: stock/doctype/item/item.py:282
+#: setup/doctype/company/company.py:256
+#: setup/setup_wizard/operations/defaults_setup.py:33
+#: setup/setup_wizard/operations/install_fixtures.py:472
+#: stock/doctype/item/item.py:281
 msgid "Stores"
 msgstr ""
 
@@ -69558,8 +70678,8 @@
 msgstr ""
 
 #. Name of a DocType
-#: buying/doctype/purchase_order/purchase_order.js:369
-#: controllers/subcontracting_controller.py:810
+#: buying/doctype/purchase_order/purchase_order.js:371
+#: controllers/subcontracting_controller.py:883
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:95
 msgid "Subcontracting Order"
@@ -69611,7 +70731,7 @@
 msgid "Subcontracting Order Supplied Item"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:864
+#: buying/doctype/purchase_order/purchase_order.py:865
 msgid "Subcontracting Order {0} created."
 msgstr ""
 
@@ -69737,8 +70857,8 @@
 msgid "Submit"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:860
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:699
+#: buying/doctype/purchase_order/purchase_order.py:861
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:709
 msgid "Submit Action Failed"
 msgstr ""
 
@@ -69770,7 +70890,7 @@
 msgid "Submit this Work Order for further processing."
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:265
+#: buying/doctype/request_for_quotation/request_for_quotation.py:264
 msgid "Submit your Quotation"
 msgstr ""
 
@@ -69932,11 +71052,11 @@
 msgid "Subscription End Date"
 msgstr ""
 
-#: accounts/doctype/subscription/subscription.py:380
+#: accounts/doctype/subscription/subscription.py:372
 msgid "Subscription End Date is mandatory to follow calendar months"
 msgstr ""
 
-#: accounts/doctype/subscription/subscription.py:370
+#: accounts/doctype/subscription/subscription.py:362
 msgid "Subscription End Date must be after {0} as per the subscription plan"
 msgstr ""
 
@@ -70080,7 +71200,7 @@
 msgid "Successful"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:543
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:540
 msgid "Successfully Reconciled"
 msgstr ""
 
@@ -70088,7 +71208,7 @@
 msgid "Successfully Set Supplier"
 msgstr ""
 
-#: stock/doctype/item/item.py:339
+#: stock/doctype/item/item.py:338
 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM."
 msgstr ""
 
@@ -70169,11 +71289,11 @@
 msgid "Summary"
 msgstr ""
 
-#: setup/doctype/email_digest/email_digest.py:190
+#: setup/doctype/email_digest/email_digest.py:188
 msgid "Summary for this month and pending activities"
 msgstr ""
 
-#: setup/doctype/email_digest/email_digest.py:187
+#: setup/doctype/email_digest/email_digest.py:185
 msgid "Summary for this week and pending activities"
 msgstr ""
 
@@ -70271,9 +71391,9 @@
 #. Name of a DocType
 #. Label of a Card Break in the Buying Workspace
 #: accounts/doctype/payment_order/payment_order.js:110
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:61
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:59
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:34
-#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:191
+#: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:190
 #: accounts/report/purchase_register/purchase_register.js:21
 #: accounts/report/purchase_register/purchase_register.py:171
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:28
@@ -70282,16 +71402,16 @@
 #: buying/doctype/request_for_quotation/request_for_quotation.js:226
 #: buying/doctype/supplier/supplier.json
 #: buying/report/procurement_tracker/procurement_tracker.py:89
-#: buying/report/purchase_order_analysis/purchase_order_analysis.py:175
+#: buying/report/purchase_order_analysis/purchase_order_analysis.py:171
 #: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:15
 #: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:30
 #: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:15
 #: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.py:30
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:51
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:199
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:195
 #: buying/workspace/buying/buying.json public/js/purchase_trends_filters.js:50
 #: public/js/purchase_trends_filters.js:63
-#: regional/report/irs_1099/irs_1099.py:79
+#: regional/report/irs_1099/irs_1099.py:77
 #: selling/doctype/customer/customer.js:225
 #: selling/doctype/sales_order/sales_order.js:1167
 #: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
@@ -70539,13 +71659,13 @@
 msgid "Supplier Address"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Purchase Order'
+#. Label of a Text Editor field in DocType 'Purchase Order'
 #: buying/doctype/purchase_order/purchase_order.json
 msgctxt "Purchase Order"
 msgid "Supplier Address Details"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Subcontracting Order'
+#. Label of a Text Editor field in DocType 'Subcontracting Order'
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
 msgctxt "Subcontracting Order"
 msgid "Supplier Address Details"
@@ -70601,16 +71721,16 @@
 #. Name of a DocType
 #: accounts/report/accounts_payable/accounts_payable.js:125
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:108
-#: accounts/report/accounts_receivable/accounts_receivable.py:1118
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:201
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.py:176
+#: accounts/report/accounts_receivable/accounts_receivable.py:1108
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:199
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.py:174
 #: accounts/report/purchase_register/purchase_register.js:27
 #: accounts/report/purchase_register/purchase_register.py:186
 #: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:55
 #: buying/doctype/request_for_quotation/request_for_quotation.js:458
 #: public/js/purchase_trends_filters.js:51
 #: regional/report/irs_1099/irs_1099.js:26
-#: regional/report/irs_1099/irs_1099.py:72
+#: regional/report/irs_1099/irs_1099.py:70
 #: setup/doctype/supplier_group/supplier_group.json
 msgid "Supplier Group"
 msgstr ""
@@ -70689,7 +71809,7 @@
 msgid "Supplier Invoice"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:216
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:214
 msgid "Supplier Invoice Date"
 msgstr ""
 
@@ -70699,14 +71819,14 @@
 msgid "Supplier Invoice Date"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1550
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1549
 msgid "Supplier Invoice Date cannot be greater than Posting Date"
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:59
 #: accounts/report/general_ledger/general_ledger.html:53
-#: accounts/report/general_ledger/general_ledger.py:669
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:210
+#: accounts/report/general_ledger/general_ledger.py:660
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:208
 msgid "Supplier Invoice No"
 msgstr ""
 
@@ -70722,7 +71842,7 @@
 msgid "Supplier Invoice No"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1575
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1574
 msgid "Supplier Invoice No exists in Purchase Invoice {0}"
 msgstr ""
 
@@ -70752,8 +71872,8 @@
 msgid "Supplier Ledger Summary"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1049
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:160
+#: accounts/report/accounts_receivable/accounts_receivable.py:1039
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:158
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:197
 #: accounts/report/purchase_register/purchase_register.py:177
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:34
@@ -70887,12 +72007,12 @@
 msgstr ""
 
 #. Name of a DocType
-#: buying/doctype/purchase_order/purchase_order.js:529
+#: buying/doctype/purchase_order/purchase_order.js:535
 #: buying/doctype/request_for_quotation/request_for_quotation.js:45
 #: buying/doctype/supplier_quotation/supplier_quotation.json
 #: buying/doctype/supplier_quotation/supplier_quotation.py:214
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:59
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:260
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:256
 #: crm/doctype/opportunity/opportunity.js:81
 #: stock/doctype/material_request/material_request.js:170
 msgid "Supplier Quotation"
@@ -70946,7 +72066,7 @@
 msgid "Supplier Quotation Item"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:433
+#: buying/doctype/request_for_quotation/request_for_quotation.py:430
 msgid "Supplier Quotation {0} Created"
 msgstr ""
 
@@ -71064,7 +72184,7 @@
 msgid "Supplier Warehouse"
 msgstr ""
 
-#: controllers/buying_controller.py:412
+#: controllers/buying_controller.py:406
 msgid "Supplier Warehouse mandatory for sub-contracted {0}"
 msgstr ""
 
@@ -71083,7 +72203,7 @@
 msgid "Supplier {0} not found in {1}"
 msgstr ""
 
-#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:68
+#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67
 msgid "Supplier(s)"
 msgstr ""
 
@@ -71101,7 +72221,7 @@
 msgstr ""
 
 #: regional/report/uae_vat_201/uae_vat_201.py:60
-#: regional/report/uae_vat_201/uae_vat_201.py:126
+#: regional/report/uae_vat_201/uae_vat_201.py:122
 msgid "Supplies subject to the reverse charge provision"
 msgstr ""
 
@@ -71173,6 +72293,12 @@
 msgid "Switch Between Payment Modes"
 msgstr ""
 
+#. Label of a Data field in DocType 'UOM'
+#: setup/doctype/uom/uom.json
+msgctxt "UOM"
+msgid "Symbol"
+msgstr ""
+
 #: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:23
 msgid "Sync Now"
 msgstr ""
@@ -71353,7 +72479,7 @@
 msgid "System will fetch all the entries if limit value is zero."
 msgstr ""
 
-#: controllers/accounts_controller.py:1762
+#: controllers/accounts_controller.py:1752
 msgid "System will not check over billing since amount for Item {0} in {1} is zero"
 msgstr ""
 
@@ -71364,16 +72490,16 @@
 msgid "System will notify to increase or decrease quantity or amount "
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:245
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:243
 msgid "TCS Amount"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:227
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:225
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:125
 msgid "TCS Rate %"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:245
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:243
 msgid "TDS Amount"
 msgstr ""
 
@@ -71386,7 +72512,7 @@
 msgid "TDS Payable"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:227
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:225
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:125
 msgid "TDS Rate %"
 msgstr ""
@@ -71402,6 +72528,11 @@
 msgid "Table for Item that will be shown in Web Site"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Tablespoon (US)"
+msgstr ""
+
 #: buying/doctype/request_for_quotation/request_for_quotation.js:466
 msgid "Tag"
 msgstr ""
@@ -71502,7 +72633,7 @@
 msgid "Target Asset {0} does not belong to company {1}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:239
+#: assets/doctype/asset_capitalization/asset_capitalization.py:237
 msgid "Target Asset {0} needs to be composite asset"
 msgstr ""
 
@@ -71582,15 +72713,15 @@
 msgid "Target Item Name"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:209
+#: assets/doctype/asset_capitalization/asset_capitalization.py:207
 msgid "Target Item {0} is neither a Fixed Asset nor a Stock Item"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:213
+#: assets/doctype/asset_capitalization/asset_capitalization.py:211
 msgid "Target Item {0} must be a Fixed Asset item"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:215
+#: assets/doctype/asset_capitalization/asset_capitalization.py:213
 msgid "Target Item {0} must be a Stock Item"
 msgstr ""
 
@@ -71600,15 +72731,15 @@
 msgid "Target Location"
 msgstr ""
 
-#: assets/doctype/asset_movement/asset_movement.py:94
+#: assets/doctype/asset_movement/asset_movement.py:100
 msgid "Target Location is required while receiving Asset {0} from an employee"
 msgstr ""
 
-#: assets/doctype/asset_movement/asset_movement.py:82
+#: assets/doctype/asset_movement/asset_movement.py:85
 msgid "Target Location is required while transferring Asset {0}"
 msgstr ""
 
-#: assets/doctype/asset_movement/asset_movement.py:89
+#: assets/doctype/asset_movement/asset_movement.py:93
 msgid "Target Location or To Employee is required while receiving Asset {0}"
 msgstr ""
 
@@ -71630,7 +72761,7 @@
 msgid "Target Qty"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:220
+#: assets/doctype/asset_capitalization/asset_capitalization.py:218
 msgid "Target Qty must be a positive number"
 msgstr ""
 
@@ -71641,7 +72772,7 @@
 msgstr ""
 
 #: stock/dashboard/item_dashboard.js:230
-#: stock/doctype/stock_entry/stock_entry.js:633
+#: stock/doctype/stock_entry/stock_entry.js:647
 msgid "Target Warehouse"
 msgstr ""
 
@@ -71694,22 +72825,22 @@
 msgstr ""
 
 #. Label of a Link field in DocType 'Stock Entry'
-#. Label of a Small Text field in DocType 'Stock Entry'
+#. Label of a Text Editor field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
 msgid "Target Warehouse Address"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:230
+#: assets/doctype/asset_capitalization/asset_capitalization.py:228
 msgid "Target Warehouse is mandatory for Decapitalization"
 msgstr ""
 
-#: controllers/selling_controller.py:709
+#: controllers/selling_controller.py:714
 msgid "Target Warehouse is set for some items but the customer is not an internal customer."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:578
-#: stock/doctype/stock_entry/stock_entry.py:585
+#: stock/doctype/stock_entry/stock_entry.py:579
+#: stock/doctype/stock_entry/stock_entry.py:586
 msgid "Target warehouse is mandatory for row {0}"
 msgstr ""
 
@@ -71935,7 +73066,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:23
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:35
-#: setup/setup_wizard/operations/taxes_setup.py:248
+#: setup/setup_wizard/operations/taxes_setup.py:251
 msgid "Tax Assets"
 msgstr ""
 
@@ -72100,11 +73231,11 @@
 msgid "Tax Category"
 msgstr ""
 
-#: controllers/buying_controller.py:173
+#: controllers/buying_controller.py:169
 msgid "Tax Category has been changed to \"Total\" because all the Items are non-stock items"
 msgstr ""
 
-#: regional/report/irs_1099/irs_1099.py:84
+#: regional/report/irs_1099/irs_1099.py:82
 msgid "Tax ID"
 msgstr ""
 
@@ -72129,7 +73260,7 @@
 #: accounts/report/customer_ledger_summary/customer_ledger_summary.js:85
 #: accounts/report/general_ledger/general_ledger.js:140
 #: accounts/report/purchase_register/purchase_register.py:192
-#: accounts/report/sales_register/sales_register.py:213
+#: accounts/report/sales_register/sales_register.py:214
 #: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:67
 msgid "Tax Id"
 msgstr ""
@@ -72218,7 +73349,7 @@
 msgid "Tax Rule"
 msgstr ""
 
-#: accounts/doctype/tax_rule/tax_rule.py:141
+#: accounts/doctype/tax_rule/tax_rule.py:137
 msgid "Tax Rule Conflicts with {0}"
 msgstr ""
 
@@ -72232,7 +73363,7 @@
 msgid "Tax Template is mandatory."
 msgstr ""
 
-#: accounts/report/sales_register/sales_register.py:293
+#: accounts/report/sales_register/sales_register.py:294
 msgid "Tax Total"
 msgstr ""
 
@@ -72312,7 +73443,7 @@
 msgid "Tax Withholding Category"
 msgstr ""
 
-#: accounts/doctype/tax_withholding_category/tax_withholding_category.py:136
+#: accounts/doctype/tax_withholding_category/tax_withholding_category.py:134
 msgid "Tax Withholding Category {} against Company {} for Customer {} should have Cumulative Threshold value."
 msgstr ""
 
@@ -72393,7 +73524,7 @@
 msgid "Tax will be withheld only for amount exceeding the cumulative threshold"
 msgstr ""
 
-#: controllers/taxes_and_totals.py:1019
+#: controllers/taxes_and_totals.py:1026
 msgid "Taxable Amount"
 msgstr ""
 
@@ -72596,7 +73727,7 @@
 msgid "Taxes and Charges Calculation"
 msgstr ""
 
-#. Label of a Markdown Editor field in DocType 'Supplier Quotation'
+#. Label of a Text Editor field in DocType 'Supplier Quotation'
 #: buying/doctype/supplier_quotation/supplier_quotation.json
 msgctxt "Supplier Quotation"
 msgid "Taxes and Charges Calculation"
@@ -72662,6 +73793,16 @@
 msgid "Team Member"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Teaspoon"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Technical Atmosphere"
+msgstr ""
+
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:69
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:93
 msgid "Telephone Expenses"
@@ -72692,7 +73833,7 @@
 msgid "Template Item"
 msgstr ""
 
-#: stock/get_item_details.py:224
+#: stock/get_item_details.py:219
 msgid "Template Item Selected"
 msgstr ""
 
@@ -73004,23 +74145,23 @@
 
 #. Name of a DocType
 #: accounts/report/accounts_receivable/accounts_receivable.js:148
-#: accounts/report/accounts_receivable/accounts_receivable.py:1102
+#: accounts/report/accounts_receivable/accounts_receivable.py:1092
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:114
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:185
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:183
 #: accounts/report/customer_ledger_summary/customer_ledger_summary.js:67
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.py:159
-#: accounts/report/gross_profit/gross_profit.py:335
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.py:157
+#: accounts/report/gross_profit/gross_profit.py:333
 #: accounts/report/inactive_sales_items/inactive_sales_items.js:8
 #: accounts/report/inactive_sales_items/inactive_sales_items.py:21
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:254
-#: accounts/report/sales_register/sales_register.py:207
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:259
+#: accounts/report/sales_register/sales_register.py:208
 #: crm/report/lead_details/lead_details.js:46
 #: crm/report/lead_details/lead_details.py:34
 #: crm/report/lost_opportunity/lost_opportunity.js:36
 #: crm/report/lost_opportunity/lost_opportunity.py:58
 #: public/js/sales_trends_filters.js:27
-#: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py:105
-#: selling/report/inactive_customers/inactive_customers.py:80
+#: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py:103
+#: selling/report/inactive_customers/inactive_customers.py:76
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:87
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:42
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:46
@@ -73205,11 +74346,16 @@
 msgid "Territory-wise Sales"
 msgstr ""
 
-#: stock/doctype/packing_slip/packing_slip.py:91
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Tesla"
+msgstr ""
+
+#: stock/doctype/packing_slip/packing_slip.py:90
 msgid "The 'From Package No.' field must neither be empty nor it's value less than 1."
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:355
+#: buying/doctype/request_for_quotation/request_for_quotation.py:352
 msgid "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings."
 msgstr ""
 
@@ -73243,11 +74389,11 @@
 msgid "The Campaign '{0}' already exists for the {1} '{2}'"
 msgstr ""
 
-#: support/doctype/service_level_agreement/service_level_agreement.py:213
+#: support/doctype/service_level_agreement/service_level_agreement.py:217
 msgid "The Condition '{0}' is invalid"
 msgstr ""
 
-#: support/doctype/service_level_agreement/service_level_agreement.py:202
+#: support/doctype/service_level_agreement/service_level_agreement.py:206
 msgid "The Document Type {0} must have a Status field to configure Service Level Agreement"
 msgstr ""
 
@@ -73255,27 +74401,27 @@
 msgid "The GL Entries will be cancelled in the background, it can take a few minutes."
 msgstr ""
 
-#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:177
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:176
 msgid "The GL Entries will be processed in the background, it can take a few minutes."
 msgstr ""
 
-#: accounts/doctype/loyalty_program/loyalty_program.py:163
+#: accounts/doctype/loyalty_program/loyalty_program.py:159
 msgid "The Loyalty Program isn't valid for the selected company"
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:750
+#: accounts/doctype/payment_request/payment_request.py:742
 msgid "The Payment Request {0} is already paid, cannot process payment twice"
 msgstr ""
 
-#: accounts/doctype/payment_terms_template/payment_terms_template.py:52
+#: accounts/doctype/payment_terms_template/payment_terms_template.py:50
 msgid "The Payment Term at row {0} is possibly a duplicate."
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:167
+#: stock/doctype/pick_list/pick_list.py:166
 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 ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1770
+#: stock/doctype/stock_entry/stock_entry.py:1802
 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty"
 msgstr ""
 
@@ -73344,19 +74490,19 @@
 msgid "The fields From Shareholder and To Shareholder cannot be blank"
 msgstr ""
 
-#: accounts/doctype/share_transfer/share_transfer.py:238
+#: accounts/doctype/share_transfer/share_transfer.py:240
 msgid "The folio numbers are not matching"
 msgstr ""
 
-#: stock/doctype/putaway_rule/putaway_rule.py:292
+#: stock/doctype/putaway_rule/putaway_rule.py:288
 msgid "The following Items, having Putaway Rules, could not be accomodated:"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:412
+#: assets/doctype/asset/depreciation.py:405
 msgid "The following assets have failed to automatically post depreciation entries: {0}"
 msgstr ""
 
-#: stock/doctype/item/item.py:832
+#: stock/doctype/item/item.py:822
 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template."
 msgstr ""
 
@@ -73364,7 +74510,7 @@
 msgid "The following employees are currently still reporting to {0}:"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.py:785
+#: stock/doctype/material_request/material_request.py:780
 msgid "The following {0} were created: {1}"
 msgstr ""
 
@@ -73378,7 +74524,7 @@
 msgid "The holiday on {0} is not between From Date and To Date"
 msgstr ""
 
-#: stock/doctype/item/item.py:585
+#: stock/doctype/item/item.py:587
 msgid "The items {0} and {1} are present in the following {2} :"
 msgstr ""
 
@@ -73406,7 +74552,7 @@
 msgid "The operation {0} can not be the sub operation"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:229
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:227
 msgid "The parent account {0} does not exists in the uploaded template"
 msgstr ""
 
@@ -73435,7 +74581,7 @@
 msgid "The percentage you are allowed to transfer more against the quantity ordered. For example, if you have ordered 100 units, and your Allowance is 10%, then you are allowed transfer 110 units."
 msgstr ""
 
-#: public/js/utils.js:814
+#: public/js/utils.js:812
 msgid "The reserved stock will be released when you update items. Are you certain you wish to proceed?"
 msgstr ""
 
@@ -73443,15 +74589,15 @@
 msgid "The reserved stock will be released. Are you certain you wish to proceed?"
 msgstr ""
 
-#: accounts/doctype/account/account.py:217
+#: accounts/doctype/account/account.py:215
 msgid "The root account {0} must be a group"
 msgstr ""
 
-#: manufacturing/doctype/bom_update_log/bom_update_log.py:86
+#: manufacturing/doctype/bom_update_log/bom_update_log.py:84
 msgid "The selected BOMs are not for the same item"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.py:415
+#: accounts/doctype/pos_invoice/pos_invoice.py:416
 msgid "The selected change account {} doesn't belongs to Company {}."
 msgstr ""
 
@@ -73467,11 +74613,11 @@
 msgid "The seller and the buyer cannot be the same"
 msgstr ""
 
-#: stock/doctype/batch/batch.py:378
+#: stock/doctype/batch/batch.py:377
 msgid "The serial no {0} does not belong to item {1}"
 msgstr ""
 
-#: accounts/doctype/share_transfer/share_transfer.py:228
+#: accounts/doctype/share_transfer/share_transfer.py:230
 msgid "The shareholder does not belong to this company"
 msgstr ""
 
@@ -73483,7 +74629,7 @@
 msgid "The shares don't exist with the {0}"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:515
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:524
 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation: <br /><br /> {1}"
 msgstr ""
 
@@ -73496,19 +74642,19 @@
 msgid "The task has been enqueued as a background job."
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:808
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:806
 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:819
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:817
 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.py:283
+#: stock/doctype/material_request/material_request.py:281
 msgid "The total Issue / Transfer quantity {0} in Material Request {1}  cannot be greater than allowed requested quantity {2} for Item {3}"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.py:290
+#: stock/doctype/material_request/material_request.py:288
 msgid "The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3}"
 msgstr ""
 
@@ -73519,11 +74665,11 @@
 msgid "The users with this Role are allowed to create/modify a stock transaction, even though the transaction is frozen."
 msgstr ""
 
-#: stock/doctype/item_alternative/item_alternative.py:57
+#: stock/doctype/item_alternative/item_alternative.py:55
 msgid "The value of {0} differs between Items {1} and {2}"
 msgstr ""
 
-#: controllers/item_variant.py:151
+#: controllers/item_variant.py:147
 msgid "The value {0} is already assigned to an existing Item {1}."
 msgstr ""
 
@@ -73539,19 +74685,19 @@
 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 ""
 
-#: manufacturing/doctype/job_card/job_card.py:678
+#: manufacturing/doctype/job_card/job_card.py:673
 msgid "The {0} ({1}) must be equal to {2} ({3})"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.py:791
+#: stock/doctype/material_request/material_request.py:786
 msgid "The {0} {1} created successfully"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:769
+#: manufacturing/doctype/job_card/job_card.py:763
 msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:503
+#: assets/doctype/asset/asset.py:498
 msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
 msgstr ""
 
@@ -73559,11 +74705,11 @@
 msgid "There are inconsistencies between the rate, no of shares and the amount calculated"
 msgstr ""
 
-#: accounts/doctype/account/account.py:202
+#: accounts/doctype/account/account.py:200
 msgid "There are ledger entries against this account. Changing {0} to non-{1} in live system will cause incorrect output in 'Accounts {2}' report"
 msgstr ""
 
-#: utilities/bulk_transaction.py:45
+#: utilities/bulk_transaction.py:43
 msgid "There are no Failed transactions"
 msgstr ""
 
@@ -73575,7 +74721,7 @@
 msgid "There are no slots available on this date"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:273
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:276
 msgid "There are only {0} asset created or linked to {1}. Please create or link {2} Assets with respective document."
 msgstr ""
 
@@ -73591,11 +74737,11 @@
 msgid "There can be multiple tiered collection factor based on the total spent. But the conversion factor for redemption will always be same for all the tier."
 msgstr ""
 
-#: accounts/party.py:555
+#: accounts/party.py:535
 msgid "There can only be 1 Account per Company in {0} {1}"
 msgstr ""
 
-#: accounts/doctype/shipping_rule/shipping_rule.py:80
+#: accounts/doctype/shipping_rule/shipping_rule.py:81
 msgid "There can only be one Shipping Rule Condition with 0 or blank value for \"To Value\""
 msgstr ""
 
@@ -73603,11 +74749,11 @@
 msgid "There is already a valid Lower Deduction Certificate {0} for Supplier {1} against category {2} for this time period."
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_bom/subcontracting_bom.py:79
+#: subcontracting/doctype/subcontracting_bom/subcontracting_bom.py:77
 msgid "There is already an active Subcontracting BOM {0} for the Finished Good {1}."
 msgstr ""
 
-#: stock/doctype/batch/batch.py:386
+#: stock/doctype/batch/batch.py:385
 msgid "There is no batch found against the {0}: {1}"
 msgstr ""
 
@@ -73615,11 +74761,11 @@
 msgid "There is nothing to edit."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1288
+#: stock/doctype/stock_entry/stock_entry.py:1297
 msgid "There must be atleast 1 Finished Good in this Stock Entry"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:151
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:153
 msgid "There was an error creating Bank Account while linking with Plaid."
 msgstr ""
 
@@ -73627,11 +74773,11 @@
 msgid "There was an error saving the document."
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:252
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:250
 msgid "There was an error syncing transactions."
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:173
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:175
 msgid "There was an error updating Bank Account {} while linking with Plaid."
 msgstr ""
 
@@ -73644,7 +74790,7 @@
 msgid "There were errors while sending email. Please try again."
 msgstr ""
 
-#: accounts/utils.py:933
+#: accounts/utils.py:915
 msgid "There were issues unlinking payment entry {0}."
 msgstr ""
 
@@ -73663,7 +74809,7 @@
 msgid "This Item is a Variant of {0} (Template)."
 msgstr ""
 
-#: setup/doctype/email_digest/email_digest.py:189
+#: setup/doctype/email_digest/email_digest.py:187
 msgid "This Month's Summary"
 msgstr ""
 
@@ -73675,7 +74821,7 @@
 msgid "This Warehouse will be auto-updated in the Work In Progress Warehouse field of Work Orders."
 msgstr ""
 
-#: setup/doctype/email_digest/email_digest.py:186
+#: setup/doctype/email_digest/email_digest.py:184
 msgid "This Week's Summary"
 msgstr ""
 
@@ -73691,7 +74837,7 @@
 msgid "This covers all scorecards tied to this Setup"
 msgstr ""
 
-#: controllers/status_updater.py:350
+#: controllers/status_updater.py:346
 msgid "This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?"
 msgstr ""
 
@@ -73787,7 +74933,7 @@
 msgid "This is considered dangerous from accounting point of view."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:529
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:533
 msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice"
 msgstr ""
 
@@ -73811,7 +74957,7 @@
 msgid "This schedule was created when Asset {0} was adjusted through Asset Value Adjustment {1}."
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:522
+#: assets/doctype/asset_capitalization/asset_capitalization.py:516
 msgid "This schedule was created when Asset {0} was consumed through Asset Capitalization {1}."
 msgstr ""
 
@@ -73819,27 +74965,27 @@
 msgid "This schedule was created when Asset {0} was repaired through Asset Repair {1}."
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:680
+#: assets/doctype/asset_capitalization/asset_capitalization.py:675
 msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:494
+#: assets/doctype/asset/depreciation.py:483
 msgid "This schedule was created when Asset {0} was restored."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1336
+#: accounts/doctype/sales_invoice/sales_invoice.py:1342
 msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:452
+#: assets/doctype/asset/depreciation.py:443
 msgid "This schedule was created when Asset {0} was scrapped."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1347
+#: accounts/doctype/sales_invoice/sales_invoice.py:1353
 msgid "This schedule was created when Asset {0} was sold through Sales Invoice {1}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1121
+#: assets/doctype/asset/asset.py:1103
 msgid "This schedule was created when Asset {0} was updated after being split into new Asset {1}."
 msgstr ""
 
@@ -73851,11 +74997,11 @@
 msgid "This schedule was created when Asset {0}'s Asset Value Adjustment {1} was cancelled."
 msgstr ""
 
-#: assets/doctype/asset_shift_allocation/asset_shift_allocation.py:246
+#: assets/doctype/asset_shift_allocation/asset_shift_allocation.py:240
 msgid "This schedule was created when Asset {0}'s shifts were adjusted through Asset Shift Allocation {1}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1184
+#: assets/doctype/asset/asset.py:1158
 msgid "This schedule was created when new Asset {0} was split from Asset {1}."
 msgstr ""
 
@@ -73889,7 +75035,7 @@
 msgid "This will restrict user access to other employee records"
 msgstr ""
 
-#: controllers/selling_controller.py:710
+#: controllers/selling_controller.py:715
 msgid "This {} will be treated as material transfer."
 msgstr ""
 
@@ -74115,7 +75261,7 @@
 msgid "Time in mins."
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:661
+#: manufacturing/doctype/job_card/job_card.py:658
 msgid "Time logs are required for {0} {1}"
 msgstr ""
 
@@ -74180,11 +75326,11 @@
 msgid "Timesheet for tasks."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:773
+#: accounts/doctype/sales_invoice/sales_invoice.py:765
 msgid "Timesheet {0} is already completed or cancelled"
 msgstr ""
 
-#: projects/doctype/timesheet/timesheet.py:530 templates/pages/projects.html:59
+#: projects/doctype/timesheet/timesheet.py:520 templates/pages/projects.html:59
 msgid "Timesheets"
 msgstr ""
 
@@ -74194,7 +75340,7 @@
 msgid "Timesheets"
 msgstr ""
 
-#: utilities/activation.py:126
+#: utilities/activation.py:124
 msgid "Timesheets help keep track of time, cost and billing for activities done by your team"
 msgstr ""
 
@@ -74470,7 +75616,7 @@
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:15
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:22
 #: accounts/report/pos_register/pos_register.js:24
-#: accounts/report/pos_register/pos_register.py:114
+#: accounts/report/pos_register/pos_register.py:110
 #: accounts/report/profitability_analysis/profitability_analysis.js:65
 #: accounts/report/purchase_register/purchase_register.js:15
 #: accounts/report/sales_payment_summary/sales_payment_summary.js:15
@@ -74644,7 +75790,7 @@
 msgid "To Date"
 msgstr ""
 
-#: controllers/accounts_controller.py:424
+#: controllers/accounts_controller.py:423
 #: setup/doctype/holiday_list/holiday_list.py:115
 msgid "To Date cannot be before From Date"
 msgstr ""
@@ -74957,11 +76103,11 @@
 msgid "To add subcontracted Item's raw materials if include exploded items is disabled."
 msgstr ""
 
-#: controllers/status_updater.py:345
+#: controllers/status_updater.py:341
 msgid "To allow over billing, update \"Over Billing Allowance\" in Accounts Settings or the Item."
 msgstr ""
 
-#: controllers/status_updater.py:341
+#: controllers/status_updater.py:337
 msgid "To allow over receipt / delivery, update \"Over Receipt/Delivery Allowance\" in Stock Settings or the Item."
 msgstr ""
 
@@ -74978,7 +76124,7 @@
 msgid "To be Delivered to Customer"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:534
+#: accounts/doctype/sales_invoice/sales_invoice.py:530
 msgid "To cancel a {} you need to cancel the POS Closing Entry {}."
 msgstr ""
 
@@ -74990,7 +76136,7 @@
 msgid "To date cannot be before from date"
 msgstr ""
 
-#: assets/doctype/asset_category/asset_category.py:109
+#: assets/doctype/asset_category/asset_category.py:111
 msgid "To enable Capital Work in Progress Accounting,"
 msgstr ""
 
@@ -74998,8 +76144,8 @@
 msgid "To include non-stock items in the material request planning. i.e. Items for which 'Maintain Stock' checkbox is unticked."
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1644
-#: controllers/accounts_controller.py:2644
+#: accounts/doctype/payment_entry/payment_entry.py:1664
+#: controllers/accounts_controller.py:2619
 msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included"
 msgstr ""
 
@@ -75007,30 +76153,30 @@
 msgid "To merge, following properties must be same for both items"
 msgstr ""
 
-#: accounts/doctype/account/account.py:517
+#: accounts/doctype/account/account.py:512
 msgid "To overrule this, enable '{0}' in company {1}"
 msgstr ""
 
-#: controllers/item_variant.py:154
+#: controllers/item_variant.py:150
 msgid "To still proceed with editing this Attribute Value, enable {0} in Item Variant Settings."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:582
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:585
 msgid "To submit the invoice without purchase order please set {0} as {1} in {2}"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:602
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:606
 msgid "To submit the invoice without purchase receipt please set {0} as {1} in {2}"
 msgstr ""
 
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:47
-#: assets/report/fixed_asset_register/fixed_asset_register.py:226
+#: assets/report/fixed_asset_register/fixed_asset_register.py:222
 msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
 msgstr ""
 
-#: accounts/report/financial_statements.py:576
-#: accounts/report/general_ledger/general_ledger.py:286
-#: accounts/report/trial_balance/trial_balance.py:278
+#: accounts/report/financial_statements.py:574
+#: accounts/report/general_ledger/general_ledger.py:277
+#: accounts/report/trial_balance/trial_balance.py:272
 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'"
 msgstr ""
 
@@ -75044,14 +76190,44 @@
 msgid "Token Endpoint"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Ton (Long)/Cubic Yard"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Ton (Short)/Cubic Yard"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Ton-Force (UK)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Ton-Force (US)"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Tonne"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Tonne-Force(Metric)"
+msgstr ""
+
 #: accounts/report/financial_statements.html:6
 msgid "Too many columns. Export the report and print it using a spreadsheet application."
 msgstr ""
 
 #. Label of a Card Break in the Manufacturing Workspace
 #. Label of a Card Break in the Stock Workspace
-#: buying/doctype/purchase_order/purchase_order.js:560
-#: buying/doctype/purchase_order/purchase_order.js:636
+#: buying/doctype/purchase_order/purchase_order.js:566
+#: buying/doctype/purchase_order/purchase_order.js:642
 #: buying/doctype/request_for_quotation/request_for_quotation.js:66
 #: buying/doctype/request_for_quotation/request_for_quotation.js:153
 #: buying/doctype/request_for_quotation/request_for_quotation.js:411
@@ -75069,25 +76245,30 @@
 msgid "Tools"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Torr"
+msgstr ""
+
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:92
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:277
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:315
 #: accounts/report/accounts_receivable/accounts_receivable.html:74
 #: accounts/report/accounts_receivable/accounts_receivable.html:235
 #: accounts/report/accounts_receivable/accounts_receivable.html:273
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py:233
-#: accounts/report/financial_statements.py:652
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py:229
+#: accounts/report/financial_statements.py:651
 #: accounts/report/general_ledger/general_ledger.py:56
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:642
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:638
 #: accounts/report/profitability_analysis/profitability_analysis.py:93
 #: accounts/report/profitability_analysis/profitability_analysis.py:98
-#: accounts/report/trial_balance/trial_balance.py:344
-#: accounts/report/trial_balance/trial_balance.py:345
-#: regional/report/vat_audit_report/vat_audit_report.py:199
+#: accounts/report/trial_balance/trial_balance.py:338
+#: accounts/report/trial_balance/trial_balance.py:339
+#: regional/report/vat_audit_report/vat_audit_report.py:195
 #: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py:28
-#: selling/report/sales_analytics/sales_analytics.py:91
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:51
-#: support/report/issue_analytics/issue_analytics.py:79
+#: selling/report/sales_analytics/sales_analytics.py:90
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:49
+#: support/report/issue_analytics/issue_analytics.py:84
 msgid "Total"
 msgstr ""
 
@@ -75279,7 +76460,7 @@
 msgid "Total Active Items"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.py:125
+#: accounts/report/budget_variance_report/budget_variance_report.py:127
 msgid "Total Actual"
 msgstr ""
 
@@ -75337,10 +76518,10 @@
 msgid "Total Allocations"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:233
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:231
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:131
 #: selling/page/sales_funnel/sales_funnel.py:151
-#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67
+#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66
 #: templates/includes/order/order_taxes.html:54
 msgid "Total Amount"
 msgstr ""
@@ -75381,11 +76562,11 @@
 msgid "Total Amount in Words"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:209
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:210
 msgid "Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges"
 msgstr ""
 
-#: accounts/report/balance_sheet/balance_sheet.py:205
+#: accounts/report/balance_sheet/balance_sheet.py:204
 msgid "Total Asset"
 msgstr ""
 
@@ -75395,7 +76576,7 @@
 msgid "Total Asset Cost"
 msgstr ""
 
-#: assets/dashboard_fixtures.py:154
+#: assets/dashboard_fixtures.py:153
 msgid "Total Assets"
 msgstr ""
 
@@ -75459,7 +76640,7 @@
 msgid "Total Billing Hours"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.py:125
+#: accounts/report/budget_variance_report/budget_variance_report.py:127
 msgid "Total Budget"
 msgstr ""
 
@@ -75497,7 +76678,7 @@
 msgid "Total Commission"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:674
+#: manufacturing/doctype/job_card/job_card.py:669
 #: manufacturing/report/job_card_summary/job_card_summary.py:174
 msgid "Total Completed Qty"
 msgstr ""
@@ -75564,7 +76745,7 @@
 msgid "Total Credit"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:241
+#: accounts/doctype/journal_entry/journal_entry.py:238
 msgid "Total Credit/ Debit Amount should be same as linked Journal Entry"
 msgstr ""
 
@@ -75574,7 +76755,7 @@
 msgid "Total Debit"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:829
+#: accounts/doctype/journal_entry/journal_entry.py:836
 msgid "Total Debit must be equal to Total Credit. The difference is {0}"
 msgstr ""
 
@@ -75582,11 +76763,11 @@
 msgid "Total Delivered Amount"
 msgstr ""
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py:248
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py:247
 msgid "Total Demand (Past Data)"
 msgstr ""
 
-#: accounts/report/balance_sheet/balance_sheet.py:212
+#: accounts/report/balance_sheet/balance_sheet.py:211
 msgid "Total Equity"
 msgstr ""
 
@@ -75596,11 +76777,11 @@
 msgid "Total Estimated Distance"
 msgstr ""
 
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:112
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:110
 msgid "Total Expense"
 msgstr ""
 
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:108
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:106
 msgid "Total Expense This Year"
 msgstr ""
 
@@ -75610,11 +76791,11 @@
 msgid "Total Experience"
 msgstr ""
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py:261
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py:260
 msgid "Total Forecast (Future Data)"
 msgstr ""
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py:254
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py:253
 msgid "Total Forecast (Past Data)"
 msgstr ""
 
@@ -75636,11 +76817,11 @@
 msgid "Total Holidays"
 msgstr ""
 
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:111
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:109
 msgid "Total Income"
 msgstr ""
 
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:107
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:105
 msgid "Total Income This Year"
 msgstr ""
 
@@ -75671,7 +76852,7 @@
 msgid "Total Invoiced Amount"
 msgstr ""
 
-#: support/report/issue_summary/issue_summary.py:76
+#: support/report/issue_summary/issue_summary.py:82
 msgid "Total Issues"
 msgstr ""
 
@@ -75679,7 +76860,7 @@
 msgid "Total Items"
 msgstr ""
 
-#: accounts/report/balance_sheet/balance_sheet.py:208
+#: accounts/report/balance_sheet/balance_sheet.py:207
 msgid "Total Liability"
 msgstr ""
 
@@ -75779,19 +76960,19 @@
 msgid "Total Operation Time"
 msgstr ""
 
-#: selling/report/inactive_customers/inactive_customers.py:84
+#: selling/report/inactive_customers/inactive_customers.py:80
 msgid "Total Order Considered"
 msgstr ""
 
-#: selling/report/inactive_customers/inactive_customers.py:83
+#: selling/report/inactive_customers/inactive_customers.py:79
 msgid "Total Order Value"
 msgstr ""
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:635
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:631
 msgid "Total Other Charges"
 msgstr ""
 
-#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:64
+#: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:62
 msgid "Total Outgoing"
 msgstr ""
 
@@ -75833,7 +77014,7 @@
 msgid "Total Paid Amount"
 msgstr ""
 
-#: controllers/accounts_controller.py:2358
+#: controllers/accounts_controller.py:2337
 msgid "Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total"
 msgstr ""
 
@@ -75841,7 +77022,7 @@
 msgid "Total Payment Request amount cannot be greater than {0} amount"
 msgstr ""
 
-#: regional/report/irs_1099/irs_1099.py:85
+#: regional/report/irs_1099/irs_1099.py:83
 msgid "Total Payments"
 msgstr ""
 
@@ -75873,7 +77054,7 @@
 msgid "Total Purchase Cost has been updated"
 msgstr ""
 
-#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66
+#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:127
 msgid "Total Qty"
 msgstr ""
@@ -75982,7 +77163,7 @@
 msgid "Total Revenue"
 msgstr ""
 
-#: selling/report/item_wise_sales_history/item_wise_sales_history.py:260
+#: selling/report/item_wise_sales_history/item_wise_sales_history.py:256
 msgid "Total Sales Amount"
 msgstr ""
 
@@ -76024,7 +77205,7 @@
 msgid "Total Tasks"
 msgstr ""
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:628
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:624
 #: accounts/report/purchase_register/purchase_register.py:263
 msgid "Total Tax"
 msgstr ""
@@ -76155,7 +77336,7 @@
 msgid "Total Taxes and Charges (Company Currency)"
 msgstr ""
 
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:132
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:130
 msgid "Total Time (in Mins)"
 msgstr ""
 
@@ -76187,7 +77368,7 @@
 msgid "Total Value Difference (Incoming - Outgoing)"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.py:125
+#: accounts/report/budget_variance_report/budget_variance_report.py:127
 #: selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py:144
 msgid "Total Variance"
 msgstr ""
@@ -76267,7 +77448,7 @@
 msgid "Total Working Hours"
 msgstr ""
 
-#: controllers/accounts_controller.py:1930
+#: controllers/accounts_controller.py:1920
 msgid "Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2})"
 msgstr ""
 
@@ -76275,11 +77456,11 @@
 msgid "Total allocated percentage for sales team should be 100"
 msgstr ""
 
-#: manufacturing/doctype/workstation/workstation.py:229
+#: manufacturing/doctype/workstation/workstation.py:230
 msgid "Total completed quantity: {0}"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:157
+#: selling/doctype/customer/customer.py:156
 msgid "Total contribution percentage should be equal to 100"
 msgstr ""
 
@@ -76287,23 +77468,23 @@
 msgid "Total hours: {0}"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.py:444
-#: accounts/doctype/sales_invoice/sales_invoice.py:518
+#: accounts/doctype/pos_invoice/pos_invoice.py:445
+#: accounts/doctype/sales_invoice/sales_invoice.py:514
 msgid "Total payments amount can't be greater than {}"
 msgstr ""
 
-#: accounts/doctype/cost_center_allocation/cost_center_allocation.py:67
+#: accounts/doctype/cost_center_allocation/cost_center_allocation.py:66
 msgid "Total percentage against cost centers should be 100"
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:765
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:766
-#: accounts/report/financial_statements.py:339
-#: accounts/report/financial_statements.py:340
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:748
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:749
+#: accounts/report/financial_statements.py:336
+#: accounts/report/financial_statements.py:337
 msgid "Total {0} ({1})"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:190
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:191
 msgid "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'"
 msgstr ""
 
@@ -76315,7 +77496,7 @@
 msgid "Total(Qty)"
 msgstr ""
 
-#: accounts/report/trial_balance_for_party/trial_balance_for_party.py:88
+#: accounts/report/trial_balance_for_party/trial_balance_for_party.py:86
 #: selling/page/point_of_sale/pos_past_order_summary.js:18
 msgid "Totals"
 msgstr ""
@@ -76424,7 +77605,7 @@
 msgid "Tracking URL"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:434
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:429
 #: manufacturing/doctype/workstation/workstation_dashboard.py:10
 msgid "Transaction"
 msgstr ""
@@ -76506,7 +77687,7 @@
 msgid "Transaction Date"
 msgstr ""
 
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:490
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:480
 msgid "Transaction Deletion Document: {0} is running for this Company. {1}"
 msgstr ""
 
@@ -76561,7 +77742,7 @@
 msgid "Transaction Settings"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:256
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:254
 msgid "Transaction Type"
 msgstr ""
 
@@ -76579,15 +77760,15 @@
 msgid "Transaction currency: {0} cannot be different from Bank Account({1}) currency: {2}"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:654
+#: manufacturing/doctype/job_card/job_card.py:651
 msgid "Transaction not allowed against stopped Work Order {0}"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1121
+#: accounts/doctype/payment_entry/payment_entry.py:1128
 msgid "Transaction reference no {0} dated {1}"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:434
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:429
 #: accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template_dashboard.py:12
 #: accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template_dashboard.py:13
 #: manufacturing/doctype/job_card/job_card_dashboard.py:9
@@ -76606,7 +77787,7 @@
 msgid "Transactions against the Company already exist! Chart of Accounts can only be imported for a Company with no transactions."
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:364
+#: buying/doctype/purchase_order/purchase_order.js:366
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.js:208
 msgid "Transfer"
 msgstr ""
@@ -76713,7 +77894,7 @@
 msgid "Transferred Quantity"
 msgstr ""
 
-#: assets/doctype/asset_movement/asset_movement.py:76
+#: assets/doctype/asset_movement/asset_movement.py:78
 msgid "Transferring cannot be done to an Employee. Please enter location where Asset {0} has to be transferred"
 msgstr ""
 
@@ -76723,7 +77904,7 @@
 msgid "Transit"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.js:425
+#: stock/doctype/stock_entry/stock_entry.js:439
 msgid "Transit Entry"
 msgstr ""
 
@@ -76842,7 +78023,7 @@
 msgid "Trial Period End Date"
 msgstr ""
 
-#: accounts/doctype/subscription/subscription.py:356
+#: accounts/doctype/subscription/subscription.py:348
 msgid "Trial Period End Date Cannot be before Trial Period Start Date"
 msgstr ""
 
@@ -76852,7 +78033,7 @@
 msgid "Trial Period Start Date"
 msgstr ""
 
-#: accounts/doctype/subscription/subscription.py:362
+#: accounts/doctype/subscription/subscription.py:354
 msgid "Trial Period Start date cannot be after Subscription Start Date"
 msgstr ""
 
@@ -77082,13 +78263,13 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:76
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:209
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:214
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:74
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:207
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:210
 #: manufacturing/doctype/workstation/workstation_job_card.html:93
 #: manufacturing/report/bom_explorer/bom_explorer.py:58
 #: manufacturing/report/bom_operations_time/bom_operations_time.py:110
-#: public/js/stock_analytics.js:94 public/js/utils.js:693
+#: public/js/stock_analytics.js:94 public/js/utils.js:691
 #: selling/doctype/sales_order/sales_order.js:1161
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:43
 #: selling/report/sales_analytics/sales_analytics.py:76
@@ -77096,10 +78277,10 @@
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:83
 #: stock/report/item_prices/item_prices.py:55
 #: stock/report/product_bundle_balance/product_bundle_balance.py:94
-#: stock/report/stock_ageing/stock_ageing.py:165
-#: stock/report/stock_analytics/stock_analytics.py:46
+#: stock/report/stock_ageing/stock_ageing.py:164
+#: stock/report/stock_analytics/stock_analytics.py:45
 #: stock/report/stock_projected_qty/stock_projected_qty.py:129
-#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61
+#: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60
 #: templates/emails/reorder_item.html:11
 #: templates/includes/rfq/rfq_items.html:17
 msgid "UOM"
@@ -77420,11 +78601,11 @@
 msgid "UOM Conversion Factor"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:1270
+#: manufacturing/doctype/production_plan/production_plan.py:1261
 msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}"
 msgstr ""
 
-#: buying/utils.py:38
+#: buying/utils.py:37
 msgid "UOM Conversion factor is required in row {0}"
 msgstr ""
 
@@ -77434,7 +78615,7 @@
 msgid "UOM Name"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2809
+#: stock/doctype/stock_entry/stock_entry.py:2842
 msgid "UOM conversion factor required for UOM: {0} in Item: {1}"
 msgstr ""
 
@@ -77444,6 +78625,10 @@
 msgid "UOM in case unspecified in imported data"
 msgstr ""
 
+#: stock/doctype/item_price/item_price.py:61
+msgid "UOM {0} not found in Item {1}"
+msgstr ""
+
 #. Label of a Table field in DocType 'Item'
 #: stock/doctype/item/item.json
 msgctxt "Item"
@@ -77482,19 +78667,19 @@
 msgid "UnReconcile"
 msgstr ""
 
-#: setup/utils.py:117
+#: setup/utils.py:115
 msgid "Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually"
 msgstr ""
 
-#: buying/doctype/supplier_scorecard/supplier_scorecard.py:74
+#: buying/doctype/supplier_scorecard/supplier_scorecard.py:78
 msgid "Unable to find score starting at {0}. You need to have standing scores covering 0 to 100"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:613
+#: manufacturing/doctype/work_order/work_order.py:624
 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 ""
 
-#: buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:97
+#: buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98
 msgid "Unable to find variable:"
 msgstr ""
 
@@ -77514,7 +78699,7 @@
 msgid "Unallocated Amount"
 msgstr ""
 
-#: stock/doctype/putaway_rule/putaway_rule.py:313
+#: stock/doctype/putaway_rule/putaway_rule.py:306
 msgid "Unassigned Qty"
 msgstr ""
 
@@ -77524,8 +78709,8 @@
 
 #: accounts/report/balance_sheet/balance_sheet.py:76
 #: accounts/report/balance_sheet/balance_sheet.py:77
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:90
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:91
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:86
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:87
 msgid "Unclosed Fiscal Years Profit / Loss (Credit)"
 msgstr ""
 
@@ -77577,6 +78762,11 @@
 msgid "Unfulfilled"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Unit"
+msgstr ""
+
 #: buying/report/procurement_tracker/procurement_tracker.py:68
 msgid "Unit of Measure"
 msgstr ""
@@ -77588,7 +78778,7 @@
 msgid "Unit of Measure (UOM)"
 msgstr ""
 
-#: stock/doctype/item/item.py:378
+#: stock/doctype/item/item.py:377
 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table"
 msgstr ""
 
@@ -77809,7 +78999,7 @@
 msgid "Unsigned"
 msgstr ""
 
-#: setup/doctype/email_digest/email_digest.py:130
+#: setup/doctype/email_digest/email_digest.py:128
 msgid "Unsubscribe from this Email Digest"
 msgstr ""
 
@@ -77842,7 +79032,7 @@
 msgid "Unverified"
 msgstr ""
 
-#: erpnext_integrations/utils.py:20
+#: erpnext_integrations/utils.py:22
 msgid "Unverified Webhook Data"
 msgstr ""
 
@@ -77863,7 +79053,7 @@
 #: accounts/doctype/account/account.js:205
 #: accounts/doctype/cost_center/cost_center.js:107
 #: public/js/bom_configurator/bom_configurator.bundle.js:406
-#: public/js/utils.js:609 public/js/utils.js:841
+#: public/js/utils.js:607 public/js/utils.js:839
 #: public/js/utils/barcode_scanner.js:183
 #: public/js/utils/serial_no_batch_selector.js:17
 #: public/js/utils/serial_no_batch_selector.js:182
@@ -78025,7 +79215,7 @@
 msgid "Update Existing Records"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:301 public/js/utils.js:793
+#: buying/doctype/purchase_order/purchase_order.js:301 public/js/utils.js:791
 #: selling/doctype/sales_order/sales_order.js:63
 msgid "Update Items"
 msgstr ""
@@ -78052,7 +79242,7 @@
 msgid "Update Rate and Availability"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:549
+#: buying/doctype/purchase_order/purchase_order.js:555
 msgid "Update Rate as per Last Purchase"
 msgstr ""
 
@@ -78107,7 +79297,7 @@
 msgid "Update latest price in all BOMs"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:340
+#: assets/doctype/asset/asset.py:336
 msgid "Update stock must be enabled for the purchase invoice {0}"
 msgstr ""
 
@@ -78127,7 +79317,7 @@
 msgid "Updating Opening Balances"
 msgstr ""
 
-#: stock/doctype/item/item.py:1349
+#: stock/doctype/item/item.py:1333
 msgid "Updating Variants..."
 msgstr ""
 
@@ -78150,7 +79340,7 @@
 msgstr ""
 
 #: setup/setup_wizard/operations/install_fixtures.py:264
-#: setup/setup_wizard/operations/install_fixtures.py:380
+#: setup/setup_wizard/operations/install_fixtures.py:372
 msgid "Upper Income"
 msgstr ""
 
@@ -78333,8 +79523,8 @@
 msgid "Used for Production Plan"
 msgstr ""
 
-#: support/report/issue_analytics/issue_analytics.py:47
-#: support/report/issue_summary/issue_summary.py:44
+#: support/report/issue_analytics/issue_analytics.py:48
+#: support/report/issue_summary/issue_summary.py:45
 msgid "User"
 msgstr ""
 
@@ -78410,7 +79600,7 @@
 msgid "User ID not set for Employee {0}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:607
+#: accounts/doctype/journal_entry/journal_entry.js:610
 msgid "User Remark"
 msgstr ""
 
@@ -78432,7 +79622,7 @@
 msgid "User Resolution Time"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:596
+#: accounts/doctype/pricing_rule/utils.py:585
 msgid "User has not applied rule on the invoice {0}"
 msgstr ""
 
@@ -78452,11 +79642,11 @@
 msgid "User {0} is disabled"
 msgstr ""
 
-#: setup/doctype/employee/employee.py:251
+#: setup/doctype/employee/employee.py:249
 msgid "User {0}: Removed Employee Self Service role as there is no mapped employee."
 msgstr ""
 
-#: setup/doctype/employee/employee.py:245
+#: setup/doctype/employee/employee.py:244
 msgid "User {0}: Removed Employee role as there is no mapped employee."
 msgstr ""
 
@@ -78530,7 +79720,7 @@
 msgstr ""
 
 #: regional/report/uae_vat_201/uae_vat_201.html:47
-#: regional/report/uae_vat_201/uae_vat_201.py:115
+#: regional/report/uae_vat_201/uae_vat_201.py:111
 msgid "VAT on Expenses and All Other Inputs"
 msgstr ""
 
@@ -78591,11 +79781,11 @@
 msgid "Valid From date not in Fiscal Year {0}"
 msgstr ""
 
-#: accounts/doctype/cost_center_allocation/cost_center_allocation.py:84
+#: accounts/doctype/cost_center_allocation/cost_center_allocation.py:82
 msgid "Valid From must be after {0} as last GL Entry against the cost center {1} posted on this date"
 msgstr ""
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:265
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:261
 #: templates/pages/order.html:59
 msgid "Valid Till"
 msgstr ""
@@ -78728,7 +79918,7 @@
 msgid "Validity in Days"
 msgstr ""
 
-#: selling/doctype/quotation/quotation.py:344
+#: selling/doctype/quotation/quotation.py:345
 msgid "Validity period of this quotation has ended."
 msgstr ""
 
@@ -78754,10 +79944,10 @@
 msgid "Valuation Method"
 msgstr ""
 
-#: accounts/report/gross_profit/gross_profit.py:266
+#: accounts/report/gross_profit/gross_profit.py:264
 #: stock/report/item_prices/item_prices.py:57
 #: stock/report/serial_no_ledger/serial_no_ledger.py:64
-#: stock/report/stock_balance/stock_balance.py:457
+#: stock/report/stock_balance/stock_balance.py:456
 #: stock/report/stock_ledger/stock_ledger.py:280
 msgid "Valuation Rate"
 msgstr ""
@@ -78847,23 +80037,23 @@
 msgid "Valuation Rate"
 msgstr ""
 
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:168
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:166
 msgid "Valuation Rate (In / Out)"
 msgstr ""
 
-#: stock/stock_ledger.py:1708
+#: stock/stock_ledger.py:1680
 msgid "Valuation Rate Missing"
 msgstr ""
 
-#: stock/stock_ledger.py:1686
+#: stock/stock_ledger.py:1658
 msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}."
 msgstr ""
 
-#: stock/doctype/item/item.py:266
+#: stock/doctype/item/item.py:265
 msgid "Valuation Rate is mandatory if Opening Stock entered"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:568
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:576
 msgid "Valuation Rate required for Item {0} at row {1}"
 msgstr ""
 
@@ -78874,12 +80064,12 @@
 msgid "Valuation and Total"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:785
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:783
 msgid "Valuation rate for customer provided items has been set to zero."
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1668
-#: controllers/accounts_controller.py:2668
+#: accounts/doctype/payment_entry/payment_entry.py:1688
+#: controllers/accounts_controller.py:2643
 msgid "Valuation type charges can not be marked as Inclusive"
 msgstr ""
 
@@ -78969,11 +80159,11 @@
 msgid "Value Or Qty"
 msgstr ""
 
-#: setup/setup_wizard/operations/install_fixtures.py:392
+#: setup/setup_wizard/operations/install_fixtures.py:384
 msgid "Value Proposition"
 msgstr ""
 
-#: controllers/item_variant.py:125
+#: controllers/item_variant.py:123
 msgid "Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4}"
 msgstr ""
 
@@ -78995,6 +80185,11 @@
 msgid "Values Changed"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Vara"
+msgstr ""
+
 #. Label of a Link field in DocType 'Supplier Scorecard Scoring Variable'
 #: buying/doctype/supplier_scorecard_scoring_variable/supplier_scorecard_scoring_variable.json
 msgctxt "Supplier Scorecard Scoring Variable"
@@ -79027,7 +80222,7 @@
 msgid "Variant"
 msgstr ""
 
-#: stock/doctype/item/item.py:849
+#: stock/doctype/item/item.py:837
 msgid "Variant Attribute Error"
 msgstr ""
 
@@ -79051,7 +80246,7 @@
 msgid "Variant Based On"
 msgstr ""
 
-#: stock/doctype/item/item.py:877
+#: stock/doctype/item/item.py:865
 msgid "Variant Based On cannot be changed"
 msgstr ""
 
@@ -79068,7 +80263,7 @@
 msgid "Variant Item"
 msgstr ""
 
-#: stock/doctype/item/item.py:846
+#: stock/doctype/item/item.py:835
 msgid "Variant Items"
 msgstr ""
 
@@ -79141,7 +80336,7 @@
 msgid "Vehicle Value"
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.py:474
+#: assets/report/fixed_asset_register/fixed_asset_register.py:464
 msgid "Vendor Name"
 msgstr ""
 
@@ -79160,6 +80355,11 @@
 msgid "Verify Email"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Versta"
+msgstr ""
+
 #. Label of a Check field in DocType 'Issue'
 #: support/doctype/issue/issue.json
 msgctxt "Issue"
@@ -79319,8 +80519,13 @@
 msgid "Voice Call Settings"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Volt-Ampere"
+msgstr ""
+
 #: accounts/report/purchase_register/purchase_register.py:163
-#: accounts/report/sales_register/sales_register.py:177
+#: accounts/report/sales_register/sales_register.py:178
 msgid "Voucher"
 msgstr ""
 
@@ -79367,25 +80572,25 @@
 msgstr ""
 
 #: accounts/doctype/payment_reconciliation/payment_reconciliation.js:279
-#: accounts/report/accounts_receivable/accounts_receivable.py:1058
+#: accounts/report/accounts_receivable/accounts_receivable.py:1048
 #: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42
-#: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:213
+#: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:210
 #: accounts/report/general_ledger/general_ledger.js:49
-#: accounts/report/general_ledger/general_ledger.py:638
+#: accounts/report/general_ledger/general_ledger.py:629
 #: accounts/report/payment_ledger/payment_ledger.js:64
 #: accounts/report/payment_ledger/payment_ledger.py:167
 #: accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
 #: public/js/utils/unreconcile.js:78
-#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:153
+#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:152
 #: stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.py:98
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:139
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:112
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:137
+#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:108
 #: stock/report/reserved_stock/reserved_stock.js:77
 #: stock/report/reserved_stock/reserved_stock.py:151
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:51
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:114
 #: stock/report/serial_no_ledger/serial_no_ledger.py:30
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:118
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:116
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:142
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:72
 msgid "Voucher No"
@@ -79455,7 +80660,7 @@
 msgid "Voucher Qty"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:632
+#: accounts/report/general_ledger/general_ledger.py:623
 msgid "Voucher Subtype"
 msgstr ""
 
@@ -79465,24 +80670,24 @@
 msgid "Voucher Subtype"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1056
-#: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:203
-#: accounts/report/general_ledger/general_ledger.py:630
+#: accounts/report/accounts_receivable/accounts_receivable.py:1046
+#: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:200
+#: accounts/report/general_ledger/general_ledger.py:621
 #: accounts/report/payment_ledger/payment_ledger.py:158
 #: accounts/report/purchase_register/purchase_register.py:158
-#: accounts/report/sales_register/sales_register.py:172
+#: accounts/report/sales_register/sales_register.py:173
 #: accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
 #: public/js/utils/unreconcile.js:70
-#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:147
+#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:146
 #: stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.py:91
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:132
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:110
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:130
+#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:106
 #: stock/report/reserved_stock/reserved_stock.js:65
 #: stock/report/reserved_stock/reserved_stock.py:145
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:40
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:107
 #: stock/report/serial_no_ledger/serial_no_ledger.py:24
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:116
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:114
 #: stock/report/stock_ledger/stock_ledger.py:303
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:136
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:66
@@ -79555,7 +80760,7 @@
 msgid "Voucher Type"
 msgstr ""
 
-#: accounts/doctype/bank_transaction/bank_transaction.py:180
+#: accounts/doctype/bank_transaction/bank_transaction.py:182
 msgid "Voucher {0} is over-allocated by {1}"
 msgstr ""
 
@@ -79654,22 +80859,22 @@
 
 #. Name of a DocType
 #: accounts/report/gross_profit/gross_profit.js:56
-#: accounts/report/gross_profit/gross_profit.py:251
+#: accounts/report/gross_profit/gross_profit.py:249
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:41
 #: accounts/report/purchase_register/purchase_register.js:52
 #: accounts/report/sales_payment_summary/sales_payment_summary.py:28
 #: accounts/report/sales_register/sales_register.js:58
-#: accounts/report/sales_register/sales_register.py:257
-#: buying/report/purchase_order_analysis/purchase_order_analysis.py:271
+#: accounts/report/sales_register/sales_register.py:258
+#: buying/report/purchase_order_analysis/purchase_order_analysis.py:267
 #: manufacturing/doctype/workstation/workstation_job_card.html:92
 #: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:15
 #: manufacturing/report/bom_stock_report/bom_stock_report.js:12
 #: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:81
 #: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py:173
-#: manufacturing/report/production_planning_report/production_planning_report.py:362
-#: manufacturing/report/production_planning_report/production_planning_report.py:405
+#: manufacturing/report/production_planning_report/production_planning_report.py:365
+#: manufacturing/report/production_planning_report/production_planning_report.py:408
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.js:8
-#: public/js/stock_analytics.js:69 public/js/utils.js:553
+#: public/js/stock_analytics.js:69 public/js/utils.js:551
 #: public/js/utils/serial_no_batch_selector.js:94
 #: selling/doctype/sales_order/sales_order.js:327
 #: selling/doctype/sales_order/sales_order.js:431
@@ -79683,11 +80888,11 @@
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:4
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.js:45
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:77
-#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:126
+#: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:125
 #: stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js:21
 #: stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.py:112
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:153
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:126
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:151
+#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:122
 #: stock/report/item_price_stock/item_price_stock.py:27
 #: stock/report/item_shortage_report/item_shortage_report.js:17
 #: stock/report/item_shortage_report/item_shortage_report.py:81
@@ -79700,10 +80905,10 @@
 #: stock/report/serial_no_ledger/serial_no_ledger.js:21
 #: stock/report/serial_no_ledger/serial_no_ledger.py:44
 #: stock/report/stock_ageing/stock_ageing.js:23
-#: stock/report/stock_ageing/stock_ageing.py:146
+#: stock/report/stock_ageing/stock_ageing.py:145
 #: stock/report/stock_analytics/stock_analytics.js:49
 #: stock/report/stock_balance/stock_balance.js:51
-#: stock/report/stock_balance/stock_balance.py:384
+#: stock/report/stock_balance/stock_balance.py:383
 #: stock/report/stock_ledger/stock_ledger.js:30
 #: stock/report/stock_ledger/stock_ledger.py:240
 #: stock/report/stock_ledger_variance/stock_ledger_variance.js:38
@@ -79711,7 +80916,7 @@
 #: stock/report/stock_projected_qty/stock_projected_qty.js:15
 #: stock/report/stock_projected_qty/stock_projected_qty.py:122
 #: stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.js:16
-#: stock/report/total_stock_summary/total_stock_summary.py:28
+#: stock/report/total_stock_summary/total_stock_summary.py:27
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:38
 #: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py:101
 #: templates/emails/reorder_item.html:9
@@ -80041,28 +81246,28 @@
 msgid "Warehouse and Reference"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse.py:95
+#: stock/doctype/warehouse/warehouse.py:93
 msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse."
 msgstr ""
 
-#: stock/doctype/serial_no/serial_no.py:85
+#: stock/doctype/serial_no/serial_no.py:82
 msgid "Warehouse cannot be changed for Serial No."
 msgstr ""
 
-#: controllers/sales_and_purchase_return.py:136
+#: controllers/sales_and_purchase_return.py:134
 msgid "Warehouse is mandatory"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse.py:246
+#: stock/doctype/warehouse/warehouse.py:244
 msgid "Warehouse not found against the account {0}"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:421
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:424
 msgid "Warehouse not found in the system"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1022
-#: stock/doctype/delivery_note/delivery_note.py:416
+#: accounts/doctype/sales_invoice/sales_invoice.py:1026
+#: stock/doctype/delivery_note/delivery_note.py:426
 msgid "Warehouse required for stock Item {0}"
 msgstr ""
 
@@ -80076,7 +81281,7 @@
 msgid "Warehouse wise Stock Value"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse.py:89
+#: stock/doctype/warehouse/warehouse.py:87
 msgid "Warehouse {0} can not be deleted as quantity exists for Item {1}"
 msgstr ""
 
@@ -80084,15 +81289,15 @@
 msgid "Warehouse {0} does not belong to Company {1}."
 msgstr ""
 
-#: stock/utils.py:436
+#: stock/utils.py:422
 msgid "Warehouse {0} does not belong to company {1}"
 msgstr ""
 
-#: controllers/stock_controller.py:426
+#: controllers/stock_controller.py:443
 msgid "Warehouse {0} is not linked to any account, please mention the account in the warehouse record or set default inventory account in company {1}."
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse.py:139
+#: stock/doctype/warehouse/warehouse.py:137
 msgid "Warehouse's Stock Value has already been booked in the following accounts:"
 msgstr ""
 
@@ -80110,15 +81315,15 @@
 msgid "Warehouses"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse.py:165
+#: stock/doctype/warehouse/warehouse.py:163
 msgid "Warehouses with child nodes cannot be converted to ledger"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse.py:175
+#: stock/doctype/warehouse/warehouse.py:173
 msgid "Warehouses with existing transaction can not be converted to group."
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse.py:167
+#: stock/doctype/warehouse/warehouse.py:165
 msgid "Warehouses with existing transaction can not be converted to ledger."
 msgstr ""
 
@@ -80210,10 +81415,10 @@
 msgid "Warn for new Request for Quotations"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:648
-#: controllers/accounts_controller.py:1765
+#: accounts/doctype/payment_entry/payment_entry.py:660
+#: controllers/accounts_controller.py:1755
 #: stock/doctype/delivery_trip/delivery_trip.js:144
-#: utilities/transaction_base.py:122
+#: utilities/transaction_base.py:120
 msgid "Warning"
 msgstr ""
 
@@ -80221,11 +81426,11 @@
 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours"
 msgstr ""
 
-#: accounts/doctype/cost_center_allocation/cost_center_allocation.py:116
+#: accounts/doctype/cost_center_allocation/cost_center_allocation.py:114
 msgid "Warning!"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:1173
+#: accounts/doctype/journal_entry/journal_entry.py:1175
 msgid "Warning: Another {0} # {1} exists against stock entry {2}"
 msgstr ""
 
@@ -80233,7 +81438,7 @@
 msgid "Warning: Material Requested Qty is less than Minimum Order Qty"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:254
+#: selling/doctype/sales_order/sales_order.py:256
 msgid "Warning: Sales Order {0} already exists against Customer's Purchase Order {1}"
 msgstr ""
 
@@ -80295,7 +81500,32 @@
 msgid "Watch Video"
 msgstr ""
 
-#: controllers/accounts_controller.py:232
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Watt"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Watt-Hour"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Wavelength In Gigametres"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Wavelength In Kilometres"
+msgstr ""
+
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Wavelength In Megametres"
+msgstr ""
+
+#: controllers/accounts_controller.py:231
 msgid "We can see {0} is made against {1}. If you want {1}'s outstanding to be updated, uncheck '{2}' checkbox. <br><br> Or you can use {3} tool to reconcile against {1} later."
 msgstr ""
 
@@ -80490,6 +81720,11 @@
 msgid "Wednesday"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Week"
+msgstr ""
+
 #. Option for the 'Billing Interval' (Select) field in DocType 'Subscription
 #. Plan'
 #: accounts/doctype/subscription_plan/subscription_plan.json
@@ -80497,8 +81732,8 @@
 msgid "Week"
 msgstr ""
 
-#: selling/report/sales_analytics/sales_analytics.py:316
-#: stock/report/stock_analytics/stock_analytics.py:115
+#: selling/report/sales_analytics/sales_analytics.py:307
+#: stock/report/stock_analytics/stock_analytics.py:112
 msgid "Week {0} {1}"
 msgstr ""
 
@@ -80744,7 +81979,7 @@
 msgid "Welcome email sent"
 msgstr ""
 
-#: setup/utils.py:168
+#: setup/utils.py:166
 msgid "Welcome to {0}"
 msgstr ""
 
@@ -80781,11 +82016,11 @@
 msgid "When creating an Item, entering a value for this field will automatically create an Item Price at the backend."
 msgstr ""
 
-#: accounts/doctype/account/account.py:332
+#: accounts/doctype/account/account.py:328
 msgid "While creating account for Child Company {0}, parent account {1} found as a ledger account."
 msgstr ""
 
-#: accounts/doctype/account/account.py:322
+#: accounts/doctype/account/account.py:318
 msgid "While creating account for Child Company {0}, parent account {1} not found. Please create the parent account in corresponding COA"
 msgstr ""
 
@@ -80868,7 +82103,7 @@
 msgid "Work Done"
 msgstr ""
 
-#: setup/doctype/company/company.py:260
+#: setup/doctype/company/company.py:257
 msgid "Work In Progress"
 msgstr ""
 
@@ -80903,15 +82138,15 @@
 #: manufacturing/report/bom_variance_report/bom_variance_report.js:14
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:19
 #: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:43
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:95
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:93
 #: manufacturing/report/job_card_summary/job_card_summary.py:145
 #: manufacturing/report/process_loss_report/process_loss_report.js:22
-#: manufacturing/report/process_loss_report/process_loss_report.py:68
+#: manufacturing/report/process_loss_report/process_loss_report.py:67
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:29
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:104
 #: selling/doctype/sales_order/sales_order.js:624
 #: stock/doctype/material_request/material_request.js:178
-#: stock/doctype/material_request/material_request.py:791
+#: stock/doctype/material_request/material_request.py:787
 #: templates/pages/material_request_info.html:45
 msgid "Work Order"
 msgstr ""
@@ -81009,16 +82244,16 @@
 msgid "Work Order Summary"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.py:796
+#: stock/doctype/material_request/material_request.py:793
 msgid "Work Order cannot be created for following reason: <br> {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:941
+#: manufacturing/doctype/work_order/work_order.py:942
 msgid "Work Order cannot be raised against a Item Template"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:1413
-#: manufacturing/doctype/work_order/work_order.py:1472
+#: manufacturing/doctype/work_order/work_order.py:1408
+#: manufacturing/doctype/work_order/work_order.py:1467
 msgid "Work Order has been {0}"
 msgstr ""
 
@@ -81026,12 +82261,12 @@
 msgid "Work Order not created"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:634
+#: stock/doctype/stock_entry/stock_entry.py:635
 msgid "Work Order {0}: Job Card not found for the operation {1}"
 msgstr ""
 
 #: manufacturing/report/job_card_summary/job_card_summary.js:56
-#: stock/doctype/material_request/material_request.py:786
+#: stock/doctype/material_request/material_request.py:781
 msgid "Work Orders"
 msgstr ""
 
@@ -81062,7 +82297,7 @@
 msgid "Work-in-Progress Warehouse"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:436
+#: manufacturing/doctype/work_order/work_order.py:430
 msgid "Work-in-Progress Warehouse is required before Submit"
 msgstr ""
 
@@ -81072,7 +82307,7 @@
 msgid "Workday"
 msgstr ""
 
-#: support/doctype/service_level_agreement/service_level_agreement.py:133
+#: support/doctype/service_level_agreement/service_level_agreement.py:137
 msgid "Workday {0} has been repeated."
 msgstr ""
 
@@ -81135,7 +82370,7 @@
 #: manufacturing/report/bom_operations_time/bom_operations_time.js:35
 #: manufacturing/report/bom_operations_time/bom_operations_time.py:119
 #: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:62
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:119
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:117
 #: manufacturing/report/job_card_summary/job_card_summary.js:72
 #: manufacturing/report/job_card_summary/job_card_summary.py:160
 #: templates/generators/bom.html:70
@@ -81238,7 +82473,7 @@
 msgid "Workstation Working Hour"
 msgstr ""
 
-#: manufacturing/doctype/workstation/workstation.py:355
+#: manufacturing/doctype/workstation/workstation.py:356
 msgid "Workstation is closed on the following dates as per Holiday List: {0}"
 msgstr ""
 
@@ -81254,7 +82489,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:72
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:96
-#: setup/doctype/company/company.py:509
+#: setup/doctype/company/company.py:501
 msgid "Write Off"
 msgstr ""
 
@@ -81441,7 +82676,7 @@
 msgid "Written Down Value"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:70
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:68
 msgid "Wrong Company"
 msgstr ""
 
@@ -81449,7 +82684,7 @@
 msgid "Wrong Password"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:55
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:53
 msgid "Wrong Template"
 msgstr ""
 
@@ -81459,6 +82694,11 @@
 msgid "XML Files Processed"
 msgstr ""
 
+#. Name of a UOM
+#: setup/setup_wizard/data/uom_data.json
+msgid "Yard"
+msgstr ""
+
 #: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py:60
 msgid "Year"
 msgstr ""
@@ -81650,27 +82890,27 @@
 msgid "Yes"
 msgstr ""
 
-#: controllers/accounts_controller.py:3242
+#: controllers/accounts_controller.py:3206
 msgid "You are not allowed to update as per the conditions set in {} Workflow."
 msgstr ""
 
-#: accounts/general_ledger.py:674
+#: accounts/general_ledger.py:666
 msgid "You are not authorized to add or update entries before {0}"
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:328
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:332
 msgid "You are not authorized to make/edit Stock Transactions for Item {0} under warehouse {1} before this time."
 msgstr ""
 
-#: accounts/doctype/account/account.py:282
+#: accounts/doctype/account/account.py:278
 msgid "You are not authorized to set Frozen value"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:347
+#: stock/doctype/pick_list/pick_list.py:346
 msgid "You are picking more than required quantity for the item {0}. Check if there is any other pick list created for the sales order {1}."
 msgstr ""
 
-#: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:105
+#: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:109
 msgid "You can add original invoice {} manually to proceed."
 msgstr ""
 
@@ -81678,23 +82918,23 @@
 msgid "You can also copy-paste this link in your browser"
 msgstr ""
 
-#: assets/doctype/asset_category/asset_category.py:112
+#: assets/doctype/asset_category/asset_category.py:114
 msgid "You can also set default CWIP account in Company {}"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:890
+#: accounts/doctype/sales_invoice/sales_invoice.py:883
 msgid "You can change the parent account to a Balance Sheet account or select a different account."
 msgstr ""
 
-#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:83
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:84
 msgid "You can not cancel this Period Closing Voucher, please cancel the future Period Closing Vouchers first"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:610
+#: accounts/doctype/journal_entry/journal_entry.py:611
 msgid "You can not enter current voucher in 'Against Journal Entry' column"
 msgstr ""
 
-#: accounts/doctype/subscription/subscription.py:183
+#: accounts/doctype/subscription/subscription.py:178
 msgid "You can only have Plans with the same billing cycle in a Subscription"
 msgstr ""
 
@@ -81720,11 +82960,11 @@
 msgid "You can set the filters to narrow the results, then click on Generate New Report to see the updated report."
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:1042
+#: manufacturing/doctype/job_card/job_card.py:1030
 msgid "You can't make any changes to Job Card since Work Order is closed."
 msgstr ""
 
-#: accounts/doctype/loyalty_program/loyalty_program.py:176
+#: accounts/doctype/loyalty_program/loyalty_program.py:172
 msgid "You can't redeem Loyalty Points having more value than the Rounded Total."
 msgstr ""
 
@@ -81732,7 +82972,7 @@
 msgid "You cannot change the rate if BOM is mentioned against any Item."
 msgstr ""
 
-#: accounts/doctype/accounting_period/accounting_period.py:123
+#: accounts/doctype/accounting_period/accounting_period.py:126
 msgid "You cannot create a {0} within the closed Accounting Period {1}"
 msgstr ""
 
@@ -81740,11 +82980,11 @@
 msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
 msgstr ""
 
-#: accounts/general_ledger.py:698
+#: accounts/general_ledger.py:686
 msgid "You cannot create/amend any accounting entries till this date."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:836
+#: accounts/doctype/journal_entry/journal_entry.py:845
 msgid "You cannot credit and debit same account at the same time"
 msgstr ""
 
@@ -81760,11 +83000,11 @@
 msgid "You cannot redeem more than {0}."
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:154
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:152
 msgid "You cannot repost item valuation before {}"
 msgstr ""
 
-#: accounts/doctype/subscription/subscription.py:735
+#: accounts/doctype/subscription/subscription.py:725
 msgid "You cannot restart a Subscription that is not cancelled."
 msgstr ""
 
@@ -81776,11 +83016,11 @@
 msgid "You cannot submit the order without payment."
 msgstr ""
 
-#: controllers/accounts_controller.py:3218
+#: controllers/accounts_controller.py:3182
 msgid "You do not have permissions to {} items in a {}."
 msgstr ""
 
-#: accounts/doctype/loyalty_program/loyalty_program.py:171
+#: accounts/doctype/loyalty_program/loyalty_program.py:167
 msgid "You don't have enough Loyalty Points to redeem"
 msgstr ""
 
@@ -81792,7 +83032,7 @@
 msgid "You had {} errors while creating opening invoices. Check {} for more details"
 msgstr ""
 
-#: public/js/utils.js:893
+#: public/js/utils.js:891
 msgid "You have already selected items from {0} {1}"
 msgstr ""
 
@@ -81804,7 +83044,7 @@
 msgid "You have entered a duplicate Delivery Note on Row"
 msgstr ""
 
-#: stock/doctype/item/item.py:1039
+#: stock/doctype/item/item.py:1027
 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels."
 msgstr ""
 
@@ -81861,7 +83101,7 @@
 msgstr ""
 
 #: patches/v11_0/add_default_dispatch_notification_template.py:22
-#: setup/setup_wizard/operations/install_fixtures.py:288
+#: setup/setup_wizard/operations/install_fixtures.py:286
 msgid "Your order is out for delivery!"
 msgstr ""
 
@@ -81891,11 +83131,11 @@
 msgid "Zero Balance"
 msgstr ""
 
-#: regional/report/uae_vat_201/uae_vat_201.py:66
+#: regional/report/uae_vat_201/uae_vat_201.py:65
 msgid "Zero Rated"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:362
+#: stock/doctype/stock_entry/stock_entry.py:363
 msgid "Zero quantity"
 msgstr ""
 
@@ -81905,7 +83145,7 @@
 msgid "Zip File"
 msgstr ""
 
-#: stock/reorder_item.py:368
+#: stock/reorder_item.py:367
 msgid "[Important] [ERPNext] Auto Reorder Errors"
 msgstr ""
 
@@ -81918,7 +83158,7 @@
 msgid "`Freeze Stocks Older Than` should be smaller than %d days."
 msgstr ""
 
-#: stock/stock_ledger.py:1700
+#: stock/stock_ledger.py:1672
 msgid "after"
 msgstr ""
 
@@ -82015,7 +83255,7 @@
 msgid "image"
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:260
+#: accounts/doctype/budget/budget.py:258
 msgid "is already"
 msgstr ""
 
@@ -82141,7 +83381,7 @@
 msgid "on"
 msgstr ""
 
-#: controllers/accounts_controller.py:1097
+#: controllers/accounts_controller.py:1109
 msgid "or"
 msgstr ""
 
@@ -82194,7 +83434,7 @@
 msgid "per hour"
 msgstr ""
 
-#: stock/stock_ledger.py:1701
+#: stock/stock_ledger.py:1673
 msgid "performing either one below:"
 msgstr ""
 
@@ -82222,7 +83462,7 @@
 msgid "ratings"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1114
+#: accounts/doctype/payment_entry/payment_entry.py:1121
 msgid "received from"
 msgstr ""
 
@@ -82299,11 +83539,11 @@
 msgid "sandbox"
 msgstr ""
 
-#: accounts/doctype/subscription/subscription.py:711
+#: accounts/doctype/subscription/subscription.py:701
 msgid "subscription is already cancelled."
 msgstr ""
 
-#: controllers/status_updater.py:353 controllers/status_updater.py:373
+#: controllers/status_updater.py:349 controllers/status_updater.py:369
 msgid "target_ref_field"
 msgstr ""
 
@@ -82319,14 +83559,14 @@
 msgid "title"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1114
+#: accounts/doctype/payment_entry/payment_entry.py:1121
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:27
 #: accounts/report/general_ledger/general_ledger.html:20
 #: www/book_appointment/index.js:134
 msgid "to"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2706
+#: accounts/doctype/sales_invoice/sales_invoice.py:2709
 msgid "to unallocate the amount of this Return Invoice before cancelling it."
 msgstr ""
 
@@ -82349,56 +83589,56 @@
 msgid "via BOM Update Tool"
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:263
+#: accounts/doctype/budget/budget.py:261
 msgid "will be"
 msgstr ""
 
-#: assets/doctype/asset_category/asset_category.py:110
+#: assets/doctype/asset_category/asset_category.py:112
 msgid "you must select Capital Work in Progress Account in accounts table"
 msgstr ""
 
-#: accounts/report/cash_flow/cash_flow.py:226
-#: accounts/report/cash_flow/cash_flow.py:227
+#: accounts/report/cash_flow/cash_flow.py:220
+#: accounts/report/cash_flow/cash_flow.py:221
 msgid "{0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:930
+#: controllers/accounts_controller.py:943
 msgid "{0} '{1}' is disabled"
 msgstr ""
 
-#: accounts/utils.py:172
+#: accounts/utils.py:168
 msgid "{0} '{1}' not in Fiscal Year {2}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:366
+#: manufacturing/doctype/work_order/work_order.py:362
 msgid "{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3}"
 msgstr ""
 
-#: stock/report/stock_ageing/stock_ageing.py:201
+#: stock/report/stock_ageing/stock_ageing.py:200
 msgid "{0} - Above"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:281
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:284
 msgid "{0} <b>{1}</b> has submitted Assets. Remove Item <b>{2}</b> from table to continue."
 msgstr ""
 
-#: controllers/accounts_controller.py:1985
+#: controllers/accounts_controller.py:1971
 msgid "{0} Account not found against Customer {1}."
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:268
+#: accounts/doctype/budget/budget.py:266
 msgid "{0} Budget for Account {1} against {2} {3} is {4}. It {5} exceed by {6}"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:758
+#: accounts/doctype/pricing_rule/utils.py:745
 msgid "{0} Coupon used are {1}. Allowed quantity is exhausted"
 msgstr ""
 
-#: setup/doctype/email_digest/email_digest.py:126
+#: setup/doctype/email_digest/email_digest.py:124
 msgid "{0} Digest"
 msgstr ""
 
-#: accounts/utils.py:1255
+#: accounts/utils.py:1228
 msgid "{0} Number {1} is already used in {2} {3}"
 msgstr ""
 
@@ -82410,11 +83650,11 @@
 msgid "{0} Request for {1}"
 msgstr ""
 
-#: stock/doctype/item/item.py:323
+#: stock/doctype/item/item.py:322
 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:428
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:423
 msgid "{0} Transaction(s) Reconciled"
 msgstr ""
 
@@ -82422,23 +83662,23 @@
 msgid "{0} account is not of type {1}"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:448
+#: stock/doctype/purchase_receipt/purchase_receipt.py:442
 msgid "{0} account not found while submitting purchase receipt"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:957
+#: accounts/doctype/journal_entry/journal_entry.py:965
 msgid "{0} against Bill {1} dated {2}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:966
+#: accounts/doctype/journal_entry/journal_entry.py:974
 msgid "{0} against Purchase Order {1}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:933
+#: accounts/doctype/journal_entry/journal_entry.py:941
 msgid "{0} against Sales Invoice {1}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:940
+#: accounts/doctype/journal_entry/journal_entry.py:948
 msgid "{0} against Sales Order {1}"
 msgstr ""
 
@@ -82446,12 +83686,12 @@
 msgid "{0} already has a Parent Procedure {1}."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:671
+#: stock/doctype/delivery_note/delivery_note.py:685
 msgid "{0} and {1}"
 msgstr ""
 
 #: accounts/report/general_ledger/general_ledger.py:66
-#: accounts/report/pos_register/pos_register.py:114
+#: accounts/report/pos_register/pos_register.py:110
 msgid "{0} and {1} are mandatory"
 msgstr ""
 
@@ -82463,16 +83703,16 @@
 msgid "{0} can not be negative"
 msgstr ""
 
-#: accounts/doctype/cost_center_allocation/cost_center_allocation.py:138
+#: accounts/doctype/cost_center_allocation/cost_center_allocation.py:136
 msgid "{0} cannot be used as a Main Cost Center because it has been used as child in Cost Center Allocation {1}"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:792
-#: manufacturing/doctype/production_plan/production_plan.py:886
+#: manufacturing/doctype/production_plan/production_plan.py:793
+#: manufacturing/doctype/production_plan/production_plan.py:887
 msgid "{0} created"
 msgstr ""
 
-#: setup/doctype/company/company.py:190
+#: setup/doctype/company/company.py:189
 msgid "{0} currency must be same as company's default currency. Please select another account."
 msgstr ""
 
@@ -82480,7 +83720,7 @@
 msgid "{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution."
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:96
+#: buying/doctype/request_for_quotation/request_for_quotation.py:95
 msgid "{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution."
 msgstr ""
 
@@ -82492,15 +83732,15 @@
 msgid "{0} entered twice in Item Tax"
 msgstr ""
 
-#: setup/doctype/item_group/item_group.py:48 stock/doctype/item/item.py:430
+#: setup/doctype/item_group/item_group.py:48 stock/doctype/item/item.py:429
 msgid "{0} entered twice {1} in Item Taxes"
 msgstr ""
 
-#: accounts/utils.py:137 projects/doctype/activity_cost/activity_cost.py:40
+#: accounts/utils.py:133 projects/doctype/activity_cost/activity_cost.py:40
 msgid "{0} for {1}"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:364
+#: accounts/doctype/payment_entry/payment_entry.py:362
 msgid "{0} has Payment Term based allocation enabled. Select a Payment Term for Row #{1} in Payment References section"
 msgstr ""
 
@@ -82512,7 +83752,7 @@
 msgid "{0} hours"
 msgstr ""
 
-#: controllers/accounts_controller.py:2304
+#: controllers/accounts_controller.py:2285
 msgid "{0} in row {1}"
 msgstr ""
 
@@ -82529,18 +83769,18 @@
 msgstr ""
 
 #: accounts/doctype/budget/budget.py:57
-#: accounts/doctype/payment_entry/payment_entry.py:551
+#: accounts/doctype/payment_entry/payment_entry.py:557
 #: accounts/report/general_ledger/general_ledger.py:62
-#: accounts/report/pos_register/pos_register.py:110 controllers/trends.py:50
+#: accounts/report/pos_register/pos_register.py:106 controllers/trends.py:50
 msgid "{0} is mandatory"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:992
+#: accounts/doctype/sales_invoice/sales_invoice.py:995
 msgid "{0} is mandatory for Item {1}"
 msgstr ""
 
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:101
-#: accounts/general_ledger.py:722
+#: accounts/general_ledger.py:710
 msgid "{0} is mandatory for account {1}"
 msgstr ""
 
@@ -82548,23 +83788,23 @@
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}"
 msgstr ""
 
-#: controllers/accounts_controller.py:2576
+#: controllers/accounts_controller.py:2551
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}."
 msgstr ""
 
-#: selling/doctype/customer/customer.py:199
+#: selling/doctype/customer/customer.py:198
 msgid "{0} is not a company bank account"
 msgstr ""
 
-#: accounts/doctype/cost_center/cost_center.py:55
+#: accounts/doctype/cost_center/cost_center.py:53
 msgid "{0} is not a group node. Please select a group node as parent cost center"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:411
+#: stock/doctype/stock_entry/stock_entry.py:412
 msgid "{0} is not a stock Item"
 msgstr ""
 
-#: controllers/item_variant.py:144
+#: controllers/item_variant.py:140
 msgid "{0} is not a valid Value for Attribute {1} of Item {2}."
 msgstr ""
 
@@ -82572,7 +83812,7 @@
 msgid "{0} is not added in the table"
 msgstr ""
 
-#: support/doctype/service_level_agreement/service_level_agreement.py:142
+#: support/doctype/service_level_agreement/service_level_agreement.py:146
 msgid "{0} is not enabled in {1}"
 msgstr ""
 
@@ -82580,15 +83820,15 @@
 msgid "{0} is not running. Cannot trigger events for this Document"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.py:566
+#: stock/doctype/material_request/material_request.py:560
 msgid "{0} is not the default supplier for any items."
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:2325
+#: accounts/doctype/payment_entry/payment_entry.py:2332
 msgid "{0} is on hold till {1}"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:121
+#: accounts/doctype/gl_entry/gl_entry.py:126
 #: accounts/doctype/pricing_rule/pricing_rule.py:165
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:193
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:118
@@ -82603,15 +83843,15 @@
 msgid "{0} items produced"
 msgstr ""
 
-#: controllers/sales_and_purchase_return.py:174
+#: controllers/sales_and_purchase_return.py:172
 msgid "{0} must be negative in return document"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1957
-msgid "{0} not allowed to transact with {1}. Please change the Company."
+#: accounts/doctype/sales_invoice/sales_invoice.py:1969
+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 ""
 
-#: manufacturing/doctype/bom/bom.py:467
+#: manufacturing/doctype/bom/bom.py:461
 msgid "{0} not found for item {1}"
 msgstr ""
 
@@ -82623,19 +83863,19 @@
 msgid "{0} payment entries can not be filtered by {1}"
 msgstr ""
 
-#: controllers/stock_controller.py:1085
+#: controllers/stock_controller.py:1111
 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:505
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:514
 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation."
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:773
+#: stock/doctype/pick_list/pick_list.py:766
 msgid "{0} units of Item {1} is not available."
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:789
+#: stock/doctype/pick_list/pick_list.py:782
 msgid "{0} units of Item {1} is picked in another Pick List."
 msgstr ""
 
@@ -82643,20 +83883,20 @@
 msgid "{0} units of {1} are required in {2}{3}, on {4} {5} for {6} to complete the transaction."
 msgstr ""
 
-#: stock/stock_ledger.py:1366 stock/stock_ledger.py:1836
-#: stock/stock_ledger.py:1852
+#: stock/stock_ledger.py:1348 stock/stock_ledger.py:1808
+#: stock/stock_ledger.py:1822
 msgid "{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction."
 msgstr ""
 
-#: stock/stock_ledger.py:1962 stock/stock_ledger.py:2012
+#: stock/stock_ledger.py:1932 stock/stock_ledger.py:1978
 msgid "{0} units of {1} needed in {2} on {3} {4} to complete this transaction."
 msgstr ""
 
-#: stock/stock_ledger.py:1360
+#: stock/stock_ledger.py:1342
 msgid "{0} units of {1} needed in {2} to complete this transaction."
 msgstr ""
 
-#: stock/utils.py:427
+#: stock/utils.py:413
 msgid "{0} valid serial nos for Item {1}"
 msgstr ""
 
@@ -82668,7 +83908,7 @@
 msgid "{0} will be given as discount."
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:780
+#: manufacturing/doctype/job_card/job_card.py:772
 msgid "{0} {1}"
 msgstr ""
 
@@ -82676,29 +83916,29 @@
 msgid "{0} {1} Manually"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:432
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:427
 msgid "{0} {1} Partially Reconciled"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:417
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:413
 msgid "{0} {1} cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
 msgstr ""
 
-#: accounts/doctype/payment_order/payment_order.py:123
+#: accounts/doctype/payment_order/payment_order.py:121
 msgid "{0} {1} created"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:515
-#: accounts/doctype/payment_entry/payment_entry.py:571
-#: accounts/doctype/payment_entry/payment_entry.py:2084
+#: accounts/doctype/payment_entry/payment_entry.py:519
+#: accounts/doctype/payment_entry/payment_entry.py:577
+#: accounts/doctype/payment_entry/payment_entry.py:2103
 msgid "{0} {1} does not exist"
 msgstr ""
 
-#: accounts/party.py:535
+#: accounts/party.py:515
 msgid "{0} {1} has accounting entries in currency {2} for company {3}. Please select a receivable or payable account with currency {2}."
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:374
+#: accounts/doctype/payment_entry/payment_entry.py:372
 msgid "{0} {1} has already been fully paid."
 msgstr ""
 
@@ -82706,87 +83946,87 @@
 msgid "{0} {1} has already been partly paid. Please use the 'Get Outstanding Invoice' or the 'Get Outstanding Orders' button to get the latest outstanding amounts."
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:450
-#: selling/doctype/sales_order/sales_order.py:484
-#: stock/doctype/material_request/material_request.py:198
+#: buying/doctype/purchase_order/purchase_order.py:451
+#: selling/doctype/sales_order/sales_order.py:490
+#: stock/doctype/material_request/material_request.py:194
 msgid "{0} {1} has been modified. Please refresh."
 msgstr ""
 
-#: stock/doctype/material_request/material_request.py:225
+#: stock/doctype/material_request/material_request.py:221
 msgid "{0} {1} has not been submitted so the action cannot be completed"
 msgstr ""
 
-#: accounts/doctype/bank_transaction/bank_transaction.py:90
+#: accounts/doctype/bank_transaction/bank_transaction.py:92
 msgid "{0} {1} is allocated twice in this Bank Transaction"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:600
+#: accounts/doctype/payment_entry/payment_entry.py:607
 msgid "{0} {1} is associated with {2}, but Party Account is {3}"
 msgstr ""
 
-#: controllers/buying_controller.py:649 controllers/selling_controller.py:422
-#: controllers/subcontracting_controller.py:810
+#: controllers/buying_controller.py:646 controllers/selling_controller.py:425
+#: controllers/subcontracting_controller.py:883
 msgid "{0} {1} is cancelled or closed"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.py:365
+#: stock/doctype/material_request/material_request.py:363
 msgid "{0} {1} is cancelled or stopped"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.py:215
+#: stock/doctype/material_request/material_request.py:211
 msgid "{0} {1} is cancelled so the action cannot be completed"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:752
+#: accounts/doctype/journal_entry/journal_entry.py:759
 msgid "{0} {1} is closed"
 msgstr ""
 
-#: accounts/party.py:769
+#: accounts/party.py:744
 msgid "{0} {1} is disabled"
 msgstr ""
 
-#: accounts/party.py:775
+#: accounts/party.py:750
 msgid "{0} {1} is frozen"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:749
+#: accounts/doctype/journal_entry/journal_entry.py:756
 msgid "{0} {1} is fully billed"
 msgstr ""
 
-#: accounts/party.py:779
+#: accounts/party.py:754
 msgid "{0} {1} is not active"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:578
+#: accounts/doctype/payment_entry/payment_entry.py:584
 msgid "{0} {1} is not associated with {2} {3}"
 msgstr ""
 
-#: accounts/utils.py:133
+#: accounts/utils.py:131
 msgid "{0} {1} is not in any active Fiscal Year"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:746
-#: accounts/doctype/journal_entry/journal_entry.py:787
+#: accounts/doctype/journal_entry/journal_entry.py:753
+#: accounts/doctype/journal_entry/journal_entry.py:794
 msgid "{0} {1} is not submitted"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:607
+#: accounts/doctype/payment_entry/payment_entry.py:617
 msgid "{0} {1} is on hold"
 msgstr ""
 
-#: controllers/buying_controller.py:495
+#: controllers/buying_controller.py:489
 msgid "{0} {1} is {2}"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:612
+#: accounts/doctype/payment_entry/payment_entry.py:623
 msgid "{0} {1} must be submitted"
 msgstr ""
 
-#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:215
+#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:219
 msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
 msgstr ""
 
-#: buying/utils.py:117
+#: buying/utils.py:110
 msgid "{0} {1} status is {2}"
 msgstr ""
 
@@ -82794,54 +84034,54 @@
 msgid "{0} {1} via CSV File"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:208
+#: accounts/doctype/gl_entry/gl_entry.py:213
 msgid "{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:237
+#: accounts/doctype/gl_entry/gl_entry.py:242
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:87
 msgid "{0} {1}: Account {2} does not belong to Company {3}"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:225
+#: accounts/doctype/gl_entry/gl_entry.py:230
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:75
 msgid "{0} {1}: Account {2} is a Group Account and group accounts cannot be used in transactions"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:232
+#: accounts/doctype/gl_entry/gl_entry.py:237
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:82
 msgid "{0} {1}: Account {2} is inactive"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:276
+#: accounts/doctype/gl_entry/gl_entry.py:279
 msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
 msgstr ""
 
-#: controllers/stock_controller.py:547
+#: controllers/stock_controller.py:562
 msgid "{0} {1}: Cost Center is mandatory for Item {2}"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:161
+#: accounts/doctype/gl_entry/gl_entry.py:166
 msgid "{0} {1}: Cost Center is required for 'Profit and Loss' account {2}."
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:252
+#: accounts/doctype/gl_entry/gl_entry.py:255
 msgid "{0} {1}: Cost Center {2} does not belong to Company {3}"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:259
+#: accounts/doctype/gl_entry/gl_entry.py:262
 msgid "{0} {1}: Cost Center {2} is a group cost center and group cost centers cannot be used in transactions"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:127
+#: accounts/doctype/gl_entry/gl_entry.py:132
 msgid "{0} {1}: Customer is required against Receivable account {2}"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:149
+#: accounts/doctype/gl_entry/gl_entry.py:154
 msgid "{0} {1}: Either debit or credit amount is required for {2}"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:133
+#: accounts/doctype/gl_entry/gl_entry.py:138
 msgid "{0} {1}: Supplier is required against Payable account {2}"
 msgstr ""
 
@@ -82849,11 +84089,11 @@
 msgid "{0}%"
 msgstr ""
 
-#: controllers/website_list_for_contact.py:205
+#: controllers/website_list_for_contact.py:203
 msgid "{0}% Billed"
 msgstr ""
 
-#: controllers/website_list_for_contact.py:213
+#: controllers/website_list_for_contact.py:211
 msgid "{0}% Delivered"
 msgstr ""
 
@@ -82866,11 +84106,11 @@
 msgid "{0}'s {1} cannot be after {2}'s Expected End Date."
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:1024
+#: manufacturing/doctype/job_card/job_card.py:1012
 msgid "{0}, complete the operation {1} before the operation {2}."
 msgstr ""
 
-#: accounts/party.py:76
+#: accounts/party.py:73
 msgid "{0}: {1} does not exists"
 msgstr ""
 
@@ -82878,49 +84118,44 @@
 msgid "{0}: {1} must be less than {2}"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:214
+#: manufacturing/doctype/bom/bom.py:211
 msgid "{0}{1} Did you rename the item? Please contact Administrator / Tech support"
 msgstr ""
 
-#: controllers/stock_controller.py:1346
+#: controllers/stock_controller.py:1367
 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1156
+#: accounts/report/accounts_receivable/accounts_receivable.py:1146
 msgid "{range4}-Above"
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.py:372
+#: assets/report/fixed_asset_register/fixed_asset_register.py:362
 msgid "{}"
 msgstr ""
 
-#: controllers/buying_controller.py:737
+#: controllers/buying_controller.py:736
 msgid "{} Assets created for {}"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1744
+#: accounts/doctype/sales_invoice/sales_invoice.py:1756
 msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
 msgstr ""
 
-#: controllers/buying_controller.py:203
+#: controllers/buying_controller.py:197
 msgid "{} has submitted assets linked to it. You need to cancel the assets to create purchase return."
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:66
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:64
 msgid "{} is a child company."
 msgstr ""
 
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.py:73
-#: accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:57
-msgid "{} is added multiple times on rows: {}"
-msgstr ""
-
-#: erpnext_integrations/doctype/tally_migration/tally_migration.py:704
+#: erpnext_integrations/doctype/tally_migration/tally_migration.py:710
 msgid "{} of {}"
 msgstr ""
 
-#: accounts/doctype/party_link/party_link.py:50
-#: accounts/doctype/party_link/party_link.py:60
+#: accounts/doctype/party_link/party_link.py:53
+#: accounts/doctype/party_link/party_link.py:63
 msgid "{} {} is already linked with another {}"
 msgstr ""
 
diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index 1c49366..b5a8b75 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -386,7 +386,7 @@
 						if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) {
 							item.has_serial_no = r.message.has_serial_no;
 							item.has_batch_no = r.message.has_batch_no;
-							item.type_of_transaction = item.qty > 0 ? "Inward" : "Outward";
+							item.type_of_transaction = item.rejected_qty > 0 ? "Inward" : "Outward";
 							item.is_rejected = true;
 
 							new erpnext.SerialBatchPackageSelector(
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 070eaf3..08e3940 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -415,7 +415,6 @@
 		let row = locals[cdt][cdn];
 		if (row.barcode) {
 			erpnext.stock.utils.set_item_details_using_barcode(this.frm, row, (r) => {
-				debugger
 				frappe.model.set_value(cdt, cdn, {
 					"item_code": r.message.item_code,
 					"qty": 1,
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 3b6810d..0df03c3 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -1530,6 +1530,7 @@
    "read_only": 1
   },
   {
+   "allow_on_submit": 1,
    "fieldname": "amount_eligible_for_commission",
    "fieldtype": "Currency",
    "label": "Amount Eligible for Commission",
@@ -1657,7 +1658,7 @@
  "idx": 105,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-03-27 13:10:36.714671",
+ "modified": "2024-03-29 16:27:41.539613",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order",
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 6afd4ac..4b8ff13 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -525,6 +525,8 @@
 		pass
 
 	def on_update_after_submit(self):
+		self.calculate_commission()
+		self.calculate_contribution()
 		self.check_credit_limit()
 
 	def before_update_after_submit(self):
diff --git a/erpnext/selling/page/point_of_sale/pos_controller.js b/erpnext/selling/page/point_of_sale/pos_controller.js
index f361976..0fefdf5 100644
--- a/erpnext/selling/page/point_of_sale/pos_controller.js
+++ b/erpnext/selling/page/point_of_sale/pos_controller.js
@@ -547,6 +547,8 @@
 
 	async on_cart_update(args) {
 		frappe.dom.freeze();
+		if (this.frm.doc.set_warehouse != this.settings.warehouse)
+			this.frm.doc.set_warehouse = this.settings.warehouse;
 		let item_row = undefined;
 		try {
 			let { field, value, item } = args;
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index 7144908..9561e47 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -1060,32 +1060,26 @@
 
 @frappe.whitelist()
 def make_delivery_trip(source_name, target_doc=None):
-	def update_stop_details(source_doc, target_doc, source_parent):
-		target_doc.customer = source_parent.customer
-		target_doc.address = source_parent.shipping_address_name
-		target_doc.customer_address = source_parent.shipping_address
-		target_doc.contact = source_parent.contact_person
-		target_doc.customer_contact = source_parent.contact_display
-		target_doc.grand_total = source_parent.grand_total
-
-		# Append unique Delivery Notes in Delivery Trip
-		delivery_notes.append(target_doc.delivery_note)
-
-	delivery_notes = []
-
+	if not target_doc:
+		target_doc = frappe.new_doc("Delivery Trip")
 	doclist = get_mapped_doc(
 		"Delivery Note",
 		source_name,
 		{
-			"Delivery Note": {"doctype": "Delivery Trip", "validation": {"docstatus": ["=", 1]}},
-			"Delivery Note Item": {
+			"Delivery Note": {
 				"doctype": "Delivery Stop",
-				"field_map": {"parent": "delivery_note"},
-				"condition": lambda item: item.parent not in delivery_notes,
-				"postprocess": update_stop_details,
+				"validation": {"docstatus": ["=", 1]},
+				"on_parent": target_doc,
+				"field_map": {
+					"name": "delivery_note",
+					"shipping_address_name": "address",
+					"shipping_address": "customer_address",
+					"contact_person": "contact",
+					"contact_display": "customer_contact",
+				},
 			},
 		},
-		target_doc,
+		ignore_child_tables=True,
 	)
 
 	return doclist
diff --git a/erpnext/stock/doctype/warehouse/warehouse.js b/erpnext/stock/doctype/warehouse/warehouse.js
index 195ecb6..96cac9c 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.js
+++ b/erpnext/stock/doctype/warehouse/warehouse.js
@@ -49,6 +49,7 @@
 			frm.add_custom_button(__("Stock Balance"), function () {
 				frappe.set_route("query-report", "Stock Balance", {
 					warehouse: frm.doc.name,
+					company: frm.doc.company,
 				});
 			});
 
diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py
index efa736c..c4156e7 100644
--- a/erpnext/stock/report/stock_ageing/stock_ageing.py
+++ b/erpnext/stock/report/stock_ageing/stock_ageing.py
@@ -229,8 +229,16 @@
 		}
 		"""
 
+		from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
+			get_serial_nos_from_bundle,
+		)
+
 		stock_ledger_entries = self.sle
 
+		bundle_wise_serial_nos = frappe._dict({})
+		if stock_ledger_entries is None:
+			bundle_wise_serial_nos = self.__get_bundle_wise_serial_nos()
+
 		with frappe.db.unbuffered_cursor():
 			if stock_ledger_entries is None:
 				stock_ledger_entries = self.__get_stock_ledger_entries()
@@ -244,6 +252,11 @@
 					d.actual_qty = flt(d.qty_after_transaction) - flt(prev_balance_qty)
 
 				serial_nos = get_serial_nos(d.serial_no) if d.serial_no else []
+				if d.serial_and_batch_bundle and d.has_serial_no:
+					if bundle_wise_serial_nos:
+						serial_nos = bundle_wise_serial_nos.get(d.serial_and_batch_bundle) or []
+					else:
+						serial_nos = get_serial_nos_from_bundle(d.serial_and_batch_bundle) or []
 
 				if d.actual_qty > 0:
 					self.__compute_incoming_stock(d, fifo_queue, transferred_item_key, serial_nos)
@@ -408,6 +421,7 @@
 				sle.serial_no,
 				sle.batch_no,
 				sle.qty_after_transaction,
+				sle.serial_and_batch_bundle,
 				sle.warehouse,
 			)
 			.where(
@@ -425,6 +439,33 @@
 
 		return sle_query.run(as_dict=True, as_iterator=True)
 
+	def __get_bundle_wise_serial_nos(self) -> dict:
+		bundle = frappe.qb.DocType("Serial and Batch Bundle")
+		entry = frappe.qb.DocType("Serial and Batch Entry")
+
+		query = (
+			frappe.qb.from_(bundle)
+			.join(entry)
+			.on(bundle.name == entry.parent)
+			.select(bundle.name, entry.serial_no)
+			.where(
+				(bundle.docstatus == 1)
+				& (entry.serial_no.isnotnull())
+				& (bundle.company == self.filters.get("company"))
+				& (bundle.posting_date <= self.filters.get("to_date"))
+			)
+		)
+
+		for field in ["item_code", "warehouse"]:
+			if self.filters.get(field):
+				query = query.where(bundle[field] == self.filters.get(field))
+
+		bundle_wise_serial_nos = frappe._dict({})
+		for bundle_name, serial_no in query.run():
+			bundle_wise_serial_nos.setdefault(bundle_name, []).append(serial_no)
+
+		return bundle_wise_serial_nos
+
 	def __get_item_query(self) -> str:
 		item_table = frappe.qb.DocType("Item")
 
diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py
index 0d31398..af07dd7 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.py
+++ b/erpnext/stock/report/stock_balance/stock_balance.py
@@ -294,6 +294,8 @@
 				sle.stock_value,
 				sle.batch_no,
 				sle.serial_no,
+				sle.serial_and_batch_bundle,
+				sle.has_serial_no,
 				item_table.item_group,
 				item_table.stock_uom,
 				item_table.item_name,
diff --git a/erpnext/stock/serial_batch_bundle.py b/erpnext/stock/serial_batch_bundle.py
index d9f3473..72945e9 100644
--- a/erpnext/stock/serial_batch_bundle.py
+++ b/erpnext/stock/serial_batch_bundle.py
@@ -844,6 +844,9 @@
 		if not doc.get("entries"):
 			return frappe._dict({})
 
+		if doc.voucher_no and frappe.get_cached_value(doc.voucher_type, doc.voucher_no, "docstatus") == 2:
+			doc.voucher_no = ""
+
 		doc.save()
 		self.validate_qty(doc)
 
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js
index aeff2f6..d407d9c 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js
@@ -335,12 +335,115 @@
 	items_remove: (frm) => {
 		set_missing_values(frm);
 	},
+
+	add_serial_batch_bundle(frm, cdt, cdn) {
+		let item = locals[cdt][cdn];
+
+		frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"]).then((r) => {
+			if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) {
+				item.has_serial_no = r.message.has_serial_no;
+				item.has_batch_no = r.message.has_batch_no;
+				item.type_of_transaction = item.qty > 0 ? "Inward" : "Outward";
+				item.is_rejected = false;
+
+				new erpnext.SerialBatchPackageSelector(frm, item, (r) => {
+					if (r) {
+						let qty = Math.abs(r.total_qty);
+						if (frm.doc.is_return) {
+							qty = qty * -1;
+						}
+
+						let update_values = {
+							serial_and_batch_bundle: r.name,
+							use_serial_batch_fields: 0,
+							qty: qty / flt(item.conversion_factor || 1, precision("conversion_factor", item)),
+						};
+
+						if (r.warehouse) {
+							update_values["warehouse"] = r.warehouse;
+						}
+
+						frappe.model.set_value(item.doctype, item.name, update_values);
+					}
+				});
+			}
+		});
+	},
+
+	add_serial_batch_for_rejected_qty(frm, cdt, cdn) {
+		let item = locals[cdt][cdn];
+
+		frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"]).then((r) => {
+			if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) {
+				item.has_serial_no = r.message.has_serial_no;
+				item.has_batch_no = r.message.has_batch_no;
+				item.type_of_transaction = item.rejected_qty > 0 ? "Inward" : "Outward";
+				item.is_rejected = true;
+
+				new erpnext.SerialBatchPackageSelector(frm, item, (r) => {
+					if (r) {
+						let qty = Math.abs(r.total_qty);
+						if (frm.doc.is_return) {
+							qty = qty * -1;
+						}
+
+						let update_values = {
+							serial_and_batch_bundle: r.name,
+							use_serial_batch_fields: 0,
+							rejected_qty:
+								qty / flt(item.conversion_factor || 1, precision("conversion_factor", item)),
+						};
+
+						if (r.warehouse) {
+							update_values["rejected_warehouse"] = r.warehouse;
+						}
+
+						frappe.model.set_value(item.doctype, item.name, update_values);
+					}
+				});
+			}
+		});
+	},
 });
 
 frappe.ui.form.on("Subcontracting Receipt Supplied Item", {
 	consumed_qty(frm) {
 		set_missing_values(frm);
 	},
+
+	add_serial_batch_bundle(frm, cdt, cdn) {
+		let item = locals[cdt][cdn];
+
+		item.item_code = item.rm_item_code;
+		item.qty = item.consumed_qty;
+		item.warehouse = frm.doc.supplier_warehouse;
+		frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"]).then((r) => {
+			if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) {
+				item.has_serial_no = r.message.has_serial_no;
+				item.has_batch_no = r.message.has_batch_no;
+				item.type_of_transaction = item.qty > 0 ? "Outward" : "Inward";
+				item.is_rejected = false;
+
+				new erpnext.SerialBatchPackageSelector(frm, item, (r) => {
+					if (r) {
+						let qty = Math.abs(r.total_qty);
+						if (frm.doc.is_return) {
+							qty = qty * -1;
+						}
+
+						let update_values = {
+							serial_and_batch_bundle: r.name,
+							use_serial_batch_fields: 0,
+							consumed_qty:
+								qty / flt(item.conversion_factor || 1, precision("conversion_factor", item)),
+						};
+
+						frappe.model.set_value(item.doctype, item.name, update_values);
+					}
+				});
+			}
+		});
+	},
 });
 
 let set_warehouse_in_children = (child_table, warehouse_field, warehouse) => {
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json b/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
index 7ad364a..a0be6c3 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -47,9 +47,11 @@
   "schedule_date",
   "reference_name",
   "section_break_45",
+  "add_serial_batch_bundle",
   "serial_and_batch_bundle",
   "use_serial_batch_fields",
   "col_break5",
+  "add_serial_batch_for_rejected_qty",
   "rejected_serial_and_batch_bundle",
   "section_break_jshh",
   "serial_no",
@@ -563,12 +565,24 @@
   {
    "fieldname": "column_break_henr",
    "fieldtype": "Column Break"
+  },
+  {
+   "depends_on": "eval:doc.use_serial_batch_fields === 0",
+   "fieldname": "add_serial_batch_bundle",
+   "fieldtype": "Button",
+   "label": "Add Serial / Batch Bundle"
+  },
+  {
+   "depends_on": "eval:doc.use_serial_batch_fields === 0",
+   "fieldname": "add_serial_batch_for_rejected_qty",
+   "fieldtype": "Button",
+   "label": "Add Serial / Batch No (Rejected Qty)"
   }
  ],
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-03-27 13:10:47.165943",
+ "modified": "2024-03-29 15:42:43.425544",
  "modified_by": "Administrator",
  "module": "Subcontracting",
  "name": "Subcontracting Receipt Item",
@@ -576,7 +590,7 @@
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "creation",
+ "sort_field": "modified",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json b/erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
index 12f67ad..3bc7217 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
@@ -25,6 +25,7 @@
   "consumed_qty",
   "current_stock",
   "secbreak_3",
+  "add_serial_batch_bundle",
   "serial_and_batch_bundle",
   "use_serial_batch_fields",
   "col_break4",
@@ -224,19 +225,25 @@
   {
    "fieldname": "column_break_qibi",
    "fieldtype": "Column Break"
+  },
+  {
+   "depends_on": "eval:doc.use_serial_batch_fields === 0",
+   "fieldname": "add_serial_batch_bundle",
+   "fieldtype": "Button",
+   "label": "Add Serial / Batch Bundle"
   }
  ],
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-03-27 13:10:47.405161",
+ "modified": "2024-03-30 10:26:27.237371",
  "modified_by": "Administrator",
  "module": "Subcontracting",
  "name": "Subcontracting Receipt Supplied Item",
  "naming_rule": "Autoincrement",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "creation",
+ "sort_field": "modified",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1